DM: Remove some more extra parenthesis, remove a useless call to c_str()

scummvm · Aug 26, 2016 · c8f6666 · c8f6666
1 parent 9c4236d
commit c8f6666
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/engines/dm/champion.cpp b/engines/dm/champion.cpp
@@ -201,7 +201,7 @@ int16 ChampionMan::f279_getDecodedValue(char *string, uint16 characterCount) {
 }
 
 void ChampionMan::f289_drawHealthOrStaminaOrManaValue(int16 posY, int16 currVal, int16 maxVal) {
-	Common::String tmp = f288_getStringFromInteger(currVal, true, 3).c_str();
+	Common::String tmp = f288_getStringFromInteger(currVal, true, 3);
 	_vm->_textMan->f52_printToViewport(55, posY, k13_ColorLightestGray, tmp.c_str());
 	_vm->_textMan->f52_printToViewport(73, posY, k13_ColorLightestGray, "/");
 	tmp = f288_getStringFromInteger(maxVal, true, 3);
@@ -781,7 +781,8 @@ int16 ChampionMan::f313_getWoundDefense(int16 champIndex, uint16 woundIndex) {
 		clearFlag(woundIndex, k0x8000_maskUseSharpDefense);
 	}
 	for (L0943_ui_ArmourShieldDefense = 0, AL0942_i_SlotIndex = k0_ChampionSlotReadyHand; AL0942_i_SlotIndex <= k1_ChampionSlotActionHand; AL0942_i_SlotIndex++) {
-		if ((L0945_T_Thing = L0946_ps_Champion->_slots[AL0942_i_SlotIndex]).getType() == k6_ArmourThingType) {
+		L0945_T_Thing = L0946_ps_Champion->_slots[AL0942_i_SlotIndex];
+		if (L0945_T_Thing.getType() == k6_ArmourThingType) {
 			L0947_ps_ArmourInfo = (ArmourInfo *)_vm->_dungeonMan->f156_getThingData(L0945_T_Thing);
 			L0947_ps_ArmourInfo = &g239_ArmourInfo[((Armour *)L0947_ps_ArmourInfo)->getType()];
 			if (getFlag(L0947_ps_ArmourInfo->_attributes, k0x0080_ArmourAttributeIsAShield)) {

diff --git a/engines/dm/dungeonman.cpp b/engines/dm/dungeonman.cpp
@@ -1513,7 +1513,7 @@ Thing DungeonMan::f165_getDiscardTHing(uint16 thingType) {
 								}
 								_vm->_dungeonMan->f173_setCurrentMap(L0284_i_CurrentMapIndex);
 								G0294_auc_LastDiscardedThingMapIndex[thingType] = L0279_ui_MapIndex;
-								return Thing((L0278_T_Thing).getTypeAndIndex());
+								return Thing(L0278_T_Thing.getTypeAndIndex());
 							}
 						}
 					} while ((L0278_T_Thing = _vm->_dungeonMan->f159_getNextThing(L0278_T_Thing)) != Thing::_endOfList);