libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 18:06:26 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

GNAP: Rework the code of Scene07::run, remove an obsolete todo

Browse Source
This commit is contained in:
Strangerke 2016-05-20 01:21:22 +02:00
parent 9a2bc3c572
commit ba61f90eb6
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/gnap/gnap.cpp
View File

@ -246,7 +246,6 @@ void GnapEngine::gameUpdateTick() {
_sceneDone = true;
}
// TODO Improve this (variable frame delay to keep ~15fps)
int currClock = _system->getMillis();
if (currClock >= _lastUpdateClock + 66) {
_gameSys->fatUpdate();

29
engines/gnap/scenes/group0.cpp
View File

@ -2830,28 +2830,19 @@ void Scene07::run() {
if (!_vm->_timers[1]) {
_vm->_timers[1] = _vm->getRandom(20) + 30;
int gnapRandomValue = _vm->getRandom(20);
// TODO Cleanup
if (plat._idleFacing != kDirNone) {
if (gnapRandomValue != 0 || plat._sequenceId != 0x7CA) {
if (gnapRandomValue != 1 || plat._sequenceId != 0x7CA) {
if (plat._pos.y == 9)
plat.playSequence(0x107CA);
} else {
plat.playSequence(0x10845);
}
} else {
if (gnapRandomValue == 0 && plat._sequenceId == 0x7CA)
plat.playSequence(0x107CC);
}
} else if (gnapRandomValue != 0 || plat._sequenceId != 0x7C9) {
if (gnapRandomValue != 1 || plat._sequenceId != 0x7C9) {
if (plat._pos.y == 9)
plat.playSequence(0x107C9);
} else {
else if (gnapRandomValue == 1 && plat._sequenceId == 0x7CA)
plat.playSequence(0x10845);
else if (plat._pos.y == 9)
plat.playSequence(0x107CA);
} else if (gnapRandomValue == 0 && plat._sequenceId == 0x7C9)
plat.playSequence(0x107CB);
else if (gnapRandomValue == 1 && plat._sequenceId == 0x7C9)
plat.playSequence(0x10844);
}
} else {
plat.playSequence(0x107CB);
}
else if (plat._pos.y == 9)
plat.playSequence(0x107C9);
gameSys.setAnimation(plat._sequenceId | (plat._sequenceDatNum << 16), plat._id, 1);
}
} else {