diff options
Diffstat (limited to 'engines/kyra/kyra_hof.cpp')
| -rw-r--r-- | engines/kyra/kyra_hof.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp index b82099f058..4497ab8019 100644 --- a/engines/kyra/kyra_hof.cpp +++ b/engines/kyra/kyra_hof.cpp @@ -857,7 +857,7 @@ void KyraEngine_HoF::loadOptionsBuffer(const char *file) { void KyraEngine_HoF::loadChapterBuffer(int chapter) { char tempString[14]; - static const char *chapterFilenames[] = { + static const char *const chapterFilenames[] = { "CH1.XXX", "CH2.XXX", "CH3.XXX", "CH4.XXX", "CH5.XXX" }; @@ -1087,7 +1087,7 @@ void KyraEngine_HoF::resetScaleTable() { } void KyraEngine_HoF::setScaleTableItem(int item, int data) { - if (item >= 1 || item <= 15) + if (item >= 1 && item <= 15) _scaleTable[item-1] = (data << 8) / 100; } @@ -1096,7 +1096,7 @@ int KyraEngine_HoF::getScale(int x, int y) { } void KyraEngine_HoF::setDrawLayerTableEntry(int entry, int data) { - if (entry >= 1 || entry <= 15) + if (entry >= 1 && entry <= 15) _drawLayerTable[entry-1] = data; } @@ -1413,7 +1413,7 @@ void KyraEngine_HoF::runIdleScript(int script) { setNextIdleAnimTimer(); } else { // FIXME: move this to staticres.cpp? - static const char *idleScriptFiles[] = { + static const char *const idleScriptFiles[] = { "_IDLHAIR.EMC", "_IDLDUST.EMC", "_IDLLEAN.EMC", "_IDLDIRT.EMC", "_IDLTOSS.EMC", "_IDLNOSE.EMC", "_IDLBRSH.EMC", "_Z3IDLE.EMC", "_Z4IDLE.EMC", "_Z6IDLE.EMC", "_Z7IDLE.EMC", "_Z8IDLE.EMC" }; |