diff options
| author | Strangerke | 2016-08-23 22:48:19 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | 35103036566a1b7a405d518f9e14e39dfdfbcdae (patch) | |
| tree | 17cfe52ce1284084784dbf0501b8c1713422b011 /engines | |
| parent | 5bd446407690f00dd4282c9840e9c82014bc2f52 (diff) | |
| download | scummvm-rg350-35103036566a1b7a405d518f9e14e39dfdfbcdae.tar.gz scummvm-rg350-35103036566a1b7a405d518f9e14e39dfdfbcdae.tar.bz2 scummvm-rg350-35103036566a1b7a405d518f9e14e39dfdfbcdae.zip | |
DM: Fix 2 more warnings
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/dm/menus.cpp | 3 | ||||
| -rw-r--r-- | engines/dm/movesens.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp index d387044dc8..69dff00b7e 100644 --- a/engines/dm/menus.cpp +++ b/engines/dm/menus.cpp @@ -509,7 +509,8 @@ int16 MenuMan::f412_getChampionSpellCastResult(uint16 champIndex) { return k0_spellCastFailure; } L1268_i_PowerSymbolOrdinal = L1270_ps_Champion->_symbols[0] - '_'; /* Values 1 to 6 */ - L1273_ui_Experience = _vm->getRandomNumber(8) + ((AL1269_ui_RequiredSkillLevel = L1271_ps_Spell->_baseRequiredSkillLevel + L1268_i_PowerSymbolOrdinal) << 4) + ((_vm->M1_ordinalToIndex(L1268_i_PowerSymbolOrdinal) * L1271_ps_Spell->_baseRequiredSkillLevel) << 3) + (AL1269_ui_RequiredSkillLevel * AL1269_ui_RequiredSkillLevel); + AL1269_ui_RequiredSkillLevel = L1271_ps_Spell->_baseRequiredSkillLevel + L1268_i_PowerSymbolOrdinal; + L1273_ui_Experience = _vm->getRandomNumber(8) + (AL1269_ui_RequiredSkillLevel << 4) + ((_vm->M1_ordinalToIndex(L1268_i_PowerSymbolOrdinal) * L1271_ps_Spell->_baseRequiredSkillLevel) << 3) + (AL1269_ui_RequiredSkillLevel * AL1269_ui_RequiredSkillLevel); AL1267_ui_SkillLevel = _vm->_championMan->getSkillLevel(champIndex, L1271_ps_Spell->_skillIndex); if (AL1267_ui_SkillLevel < AL1269_ui_RequiredSkillLevel) { L1274_i_MissingSkillLevelCount = AL1269_ui_RequiredSkillLevel - AL1267_ui_SkillLevel; diff --git a/engines/dm/movesens.cpp b/engines/dm/movesens.cpp index 4c2a9cbb84..adc9b5565f 100644 --- a/engines/dm/movesens.cpp +++ b/engines/dm/movesens.cpp @@ -785,7 +785,7 @@ void MovesensMan::f276_sensorProcessThingAdditionOrRemoval(uint16 mapX, uint16 m } L0777_ui_Square = _vm->_dungeonMan->_g271_currMapData[mapX][mapY]; - if (Square(L0777_ui_Square).getType() == k0_ElementTypeWall) { + if (Square(L0777_ui_Square).getType() == k0_WallElemType) { L0770_ui_SensorTriggeredCell = thing.getCell(); } else { L0770_ui_SensorTriggeredCell = kM1_CellAny; // this will wrap around |