DM: Fix 2 more warnings

scummvm · Aug 26, 2016 · 3510303 · 3510303
1 parent 5bd4464
commit 3510303
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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