diff options
author | Peter Kohaut | 2018-03-17 17:07:51 +0100 |
---|---|---|
committer | Peter Kohaut | 2018-03-17 17:07:51 +0100 |
commit | 5b50bad5e95808052048b9e5cd58cacc8c0dfac2 (patch) | |
tree | dc82de51da7c7d21dae2f30b78df738395d1bbd3 /engines/bladerunner/script | |
parent | 19d9e4cec818980a75772a204c96774afbd2b17e (diff) | |
download | scummvm-rg350-5b50bad5e95808052048b9e5cd58cacc8c0dfac2.tar.gz scummvm-rg350-5b50bad5e95808052048b9e5cd58cacc8c0dfac2.tar.bz2 scummvm-rg350-5b50bad5e95808052048b9e5cd58cacc8c0dfac2.zip |
BLADERUNNER: Fixed compilation warnings
Diffstat (limited to 'engines/bladerunner/script')
-rw-r--r-- | engines/bladerunner/script/script.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/script/script.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp index ff2a840a28..fc595bc3de 100644 --- a/engines/bladerunner/script/script.cpp +++ b/engines/bladerunner/script/script.cpp @@ -218,8 +218,8 @@ void ScriptBase::Actor_Combat_AI_Hit_Attempt(int actorId) { _vm->_actors[actorId]->_combatInfo->hitAttempt(); } -void ScriptBase::Non_Player_Actor_Combat_Mode_On(int actorId, int initialState, bool rangedAttack, int enemyId, int waypointType, int animationModeCombatIdle, int animationModeCombatWalk, int animationModeCombatRun, int fleeRatio, int coverRatio, int actionRatio, int damage, int range, bool a14) { - _vm->_actors[actorId]->combatModeOn(initialState, rangedAttack, enemyId, waypointType, animationModeCombatIdle, animationModeCombatWalk, animationModeCombatRun, fleeRatio, coverRatio, actionRatio, damage, range, a14); +void ScriptBase::Non_Player_Actor_Combat_Mode_On(int actorId, int initialState, bool rangedAttack, int enemyId, int waypointType, int animationModeCombatIdle, int animationModeCombatWalk, int animationModeCombatRun, int fleeRatio, int coverRatio, int actionRatio, int damage, int range, bool unstoppable) { + _vm->_actors[actorId]->combatModeOn(initialState, rangedAttack, enemyId, waypointType, animationModeCombatIdle, animationModeCombatWalk, animationModeCombatRun, fleeRatio, coverRatio, actionRatio, damage, range, unstoppable); } void ScriptBase::Non_Player_Actor_Combat_Mode_Off(int actorId) { diff --git a/engines/bladerunner/script/script.h b/engines/bladerunner/script/script.h index 9df231a1c3..3940c457bc 100644 --- a/engines/bladerunner/script/script.h +++ b/engines/bladerunner/script/script.h @@ -78,7 +78,7 @@ protected: void Actor_Set_Flag_Damage_Anim_If_Moving(int actorId, bool value); bool Actor_Query_Flag_Damage_Anim_If_Moving(int actorId); void Actor_Combat_AI_Hit_Attempt(int actorId); - void Non_Player_Actor_Combat_Mode_On(int actorId, int initialState, bool rangedAttack, int enemyId, int waypointType, int animationModeCombatIdle, int animationModeCombatWalk, int animationModeCombatRun, int fleeRatio, int coverRatio, int actionRatio, int damage, int range, bool a14); + void Non_Player_Actor_Combat_Mode_On(int actorId, int initialState, bool rangedAttack, int enemyId, int waypointType, int animationModeCombatIdle, int animationModeCombatWalk, int animationModeCombatRun, int fleeRatio, int coverRatio, int actionRatio, int damage, int range, bool unstoppable); void Non_Player_Actor_Combat_Mode_Off(int actorId); void Actor_Set_Health(int actorId, int hp, int maxHp); void Actor_Set_Targetable(int actorId, bool targetable); |