mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 10:15:32 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'cc9cii/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-05-28 14:45:57 +02:00
commit bb011f278e
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/esmtool/labels.cpp
View file

@ -387,7 +387,7 @@ std::string magicEffectLabel(int idx)
"sEffectSummonCreature04", "sEffectSummonCreature04",
"sEffectSummonCreature05" "sEffectSummonCreature05"
}; };
if (idx >= 0 && idx <= 143) if (idx >= 0 && idx <= 142)
return magicEffectLabels[idx]; return magicEffectLabels[idx];
else else
return "Invalid"; return "Invalid";
@ -471,7 +471,7 @@ std::string skillLabel(int idx)
"Speechcraft", "Speechcraft",
"Hand-to-hand" "Hand-to-hand"
}; };
if (idx >= 0 && idx <= 27) if (idx >= 0 && idx <= 26)
return skillLabels[idx]; return skillLabels[idx];
else else
return "Invalid"; return "Invalid";
@ -498,7 +498,7 @@ std::string rangeTypeLabel(int idx)
"Touch", "Touch",
"Target" "Target"
}; };
if (idx >= 0 && idx <= 3) if (idx >= 0 && idx <= 2)
return rangeTypeLabels[idx]; return rangeTypeLabels[idx];
else else
return "Invalid"; return "Invalid";

2
components/compiler/exprparser.cpp
View file

@ -98,7 +98,7 @@ namespace Compiler
else if (t1=='f' || t2=='f') else if (t1=='f' || t2=='f')
mOperands.push_back ('f'); mOperands.push_back ('f');
else else
std::logic_error ("failed to determine result operand type"); throw std::logic_error ("failed to determine result operand type");
} }
void ExprParser::pop() void ExprParser::pop()

2
extern/shiny/Main/Factory.hpp vendored
View file

@ -206,7 +206,7 @@ namespace sh
std::string getCacheFolder () { return mPlatform->getCacheFolder (); } std::string getCacheFolder () { return mPlatform->getCacheFolder (); }
bool getReadSourceCache() { return mReadSourceCache; } bool getReadSourceCache() { return mReadSourceCache; }
bool getWriteSourceCache() { return mReadSourceCache; } bool getWriteSourceCache() { return mWriteSourceCache; }
public: public:
bool getWriteMicrocodeCache() { return mWriteMicrocodeCache; } // Fixme bool getWriteMicrocodeCache() { return mWriteMicrocodeCache; } // Fixme