diff options
| author | Bendegúz Nagy | 2016-08-10 14:23:22 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | 9b772cfb75de39a6800e8016bdccde60ae2246d7 (patch) | |
| tree | 9af198328ac87c70ee1416b60bf6fa506884a96c | |
| parent | 9e3e58a7227a162f461da8ef8a2ab80b95fbb11a (diff) | |
| download | scummvm-rg350-9b772cfb75de39a6800e8016bdccde60ae2246d7.tar.gz scummvm-rg350-9b772cfb75de39a6800e8016bdccde60ae2246d7.tar.bz2 scummvm-rg350-9b772cfb75de39a6800e8016bdccde60ae2246d7.zip | |
DM: Fix possibly dangerous cast in eventman.cpp, moveParty
| -rw-r--r-- | engines/dm/eventman.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp index e0ac2c45bd..319156fd36 100644 --- a/engines/dm/eventman.cpp +++ b/engines/dm/eventman.cpp @@ -933,8 +933,7 @@ void EventManager::f366_commandMoveParty(CommandType cmdType) { L1119_ps_Champion = _vm->_championMan->_gK71_champions; for (AL1118_ui_ChampionIndex = k0_ChampionFirst; AL1118_ui_ChampionIndex < _vm->_championMan->_g305_partyChampionCount; AL1118_ui_ChampionIndex++) { if (L1119_ps_Champion->_currHealth) { - warning(false, "possibly dangerous cast to uint16"); - AL1115_ui_Ticks = MAX(AL1115_ui_Ticks, (uint16)_vm->_championMan->f310_getMovementTicks(L1119_ps_Champion)); + AL1115_ui_Ticks = MAX((int32)AL1115_ui_Ticks, (int32)_vm->_championMan->f310_getMovementTicks(L1119_ps_Champion)); } L1119_ps_Champion++; } |