aboutsummaryrefslogtreecommitdiff
path: root/engines/dm/menus.cpp
diff options
context:
space:
mode:
authorStrangerke2016-09-13 22:07:02 +0200
committerStrangerke2016-09-13 22:08:01 +0200
commit9f324dff86466cd6a15f1b96ada4d835755498be (patch)
tree8dd550e5dbbaa9b221c33516613d4c1523a2255a /engines/dm/menus.cpp
parent2a9d29f067a8e5f292514ab0c10d055c286178de (diff)
downloadscummvm-rg350-9f324dff86466cd6a15f1b96ada4d835755498be.tar.gz
scummvm-rg350-9f324dff86466cd6a15f1b96ada4d835755498be.tar.bz2
scummvm-rg350-9f324dff86466cd6a15f1b96ada4d835755498be.zip
DM: Silence some GCC warnings
Diffstat (limited to 'engines/dm/menus.cpp')
-rw-r--r--engines/dm/menus.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp
index e06aae8e26..7bc6d59950 100644
--- a/engines/dm/menus.cpp
+++ b/engines/dm/menus.cpp
@@ -1518,9 +1518,9 @@ bool MenuMan::isMeleeActionPerformed(int16 champIndex, Champion *champ, int16 ac
}
bool MenuMan::isGroupFrightenedByAction(int16 champIndex, uint16 actionIndex, int16 mapX, int16 mapY) {
- bool isGroupFrightenedByAction = false;
+ bool retVal = false;
if (_actionTargetGroupThing == Thing::_endOfList)
- return isGroupFrightenedByAction;
+ return retVal;
uint16 experience = 0;
int16 frightAmount = 0;
@@ -1561,11 +1561,11 @@ bool MenuMan::isGroupFrightenedByAction(int16 champIndex, uint16 actionIndex, in
}
targetGroup->setBehaviour(k5_behavior_FLEE);
activeGroup->_delayFleeingFromTarget = ((16 - fearResistance) << 2) / creatureInfo->_movementTicks;
- isGroupFrightenedByAction = true;
+ retVal = true;
}
_vm->_championMan->addSkillExperience(champIndex, kDMSkillInfluence, experience);
- return isGroupFrightenedByAction;
+ return retVal;
}
void MenuMan::printMessageAfterReplacements(const char *str) {