libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 15:21:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WAGE: Fix crashes during direction change

Browse Source
This commit is contained in:
Eugene Sandulenko 2016-01-31 16:13:34 +01:00
parent efc7bf6451
commit 12f02969be
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/wage/combat.cpp
View File

@ -409,10 +409,9 @@ void WageEngine::performMove(Chr *chr, int validMoves) {
int dir = _rnd->getRandomNumber(numValidMoves); int dir = _rnd->getRandomNumber(numValidMoves);
// And get it // And get it
for (int i = 0; i < 4; i++, dir--) for (int i = 0; i < 4; i++, dir--)
if ((validMoves & (1 << i)) != 0) { if ((validMoves & (1 << i)) != 0) {
if (dir == 0) { if (dir == 1) {
dir = i; dir = i;
break; break;
} }

7
engines/wage/wage.cpp
View File

@ -336,13 +336,6 @@ void WageEngine::onMove(Designed *what, Designed *from, Designed *to) {
return; return;
} }
if (!_temporarilyHidden) {
assert(what);
assert(from);
assert(to);
debug(6, "move: %s, %s -> %s", what->_name.c_str(), from->_name.c_str(), to->_name.c_str());
}
if (from == currentScene || to == currentScene || if (from == currentScene || to == currentScene ||
(what->_classType == CHR && ((Chr *)what)->_currentScene == currentScene) || (what->_classType == CHR && ((Chr *)what)->_currentScene == currentScene) ||
(what->_classType == OBJ && ((Obj *)what)->_currentScene == currentScene)) (what->_classType == OBJ && ((Obj *)what)->_currentScene == currentScene))