mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Provide a default encoding when changing to "Function".

Browse Source
This commit is contained in:
cc9cii 2015-05-10 13:34:45 +10:00
parent 587efcfe9d
commit ab21c0551c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/opencs/model/world/nestedcoladapterimp.cpp
View File

@ -854,7 +854,14 @@ namespace CSMWorld
{ {
// FIXME: when these change the values of the other columns need to change // FIXME: when these change the values of the other columns need to change
// correspondingly (and automatically) // correspondingly (and automatically)
case 1: conditions[subRowIndex].mSelectRule[1] = '1'; break; // Function case 1:
{
conditions[subRowIndex].mSelectRule[1] = '1'; // Function
// default to "Rank Low"
conditions[subRowIndex].mSelectRule[2] = '0';
conditions[subRowIndex].mSelectRule[3] = '0';
break;
}
case 2: conditions[subRowIndex].mSelectRule[1] = '2'; break; // Global case 2: conditions[subRowIndex].mSelectRule[1] = '2'; break; // Global
case 3: conditions[subRowIndex].mSelectRule[1] = '3'; break; // Local case 3: conditions[subRowIndex].mSelectRule[1] = '3'; break; // Local
case 4: conditions[subRowIndex].mSelectRule[1] = '4'; break; // Journal case 4: conditions[subRowIndex].mSelectRule[1] = '4'; break; // Journal
@ -874,7 +881,6 @@ namespace CSMWorld
{ {
if (conditions[subRowIndex].mSelectRule[1] == '1') if (conditions[subRowIndex].mSelectRule[1] == '1')
{ {
// throws an exception if the function is not found
const std::map<const std::string, std::string>::const_iterator it = sInfoFuncToEnc.find( const std::map<const std::string, std::string>::const_iterator it = sInfoFuncToEnc.find(
value.toString().toUtf8().constData()); value.toString().toUtf8().constData());
if (it != sInfoFuncToEnc.end()) if (it != sInfoFuncToEnc.end())