ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

MADS: Remove dead code in scene 608, some rework

Browse Source
This commit is contained in:
Strangerke
2014-05-26 22:14:51 +02:00
parent c20fabb980
commit b035333dfd
1 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/mads/nebular/nebular_scenes6.cpp
+3 -29
View File
@@ -1925,72 +1925,46 @@ void Scene608::step() {
if ((_carMode == 4) && (_scene->_activeAnimation != nullptr)) {
if (_scene->_activeAnimation->getCurrentFrame() != _carFrame) {
_carFrame = _scene->_activeAnimation->getCurrentFrame();
int nextFrame = -1;
if (_carFrame == 10) {
_game._player._visible = true;
_game._player._priorTimer = _scene->_activeAnimation->getNextFrameTimer() - _game._player._ticksAmount;
}
if (_carFrame == 56) {
} else if (_carFrame == 56) {
resetDogVariables();
_animationMode = 0;
_nextTrigger = 2;
}
if ((nextFrame >= 0) && (nextFrame != _scene->_activeAnimation->getCurrentFrame())) {
_scene->_activeAnimation->setCurrentFrame(nextFrame);
_carFrame = nextFrame;
}
}
}
if ((_carMode == 5) && (_scene->_activeAnimation != nullptr)) {
if (_scene->_activeAnimation->getCurrentFrame() != _carFrame) {
_carFrame = _scene->_activeAnimation->getCurrentFrame();
int nextFrame = -1;
if (_carFrame == 10) {
_game._player._visible = true;
_game._player._priorTimer = _scene->_activeAnimation->getNextFrameTimer() - _game._player._ticksAmount;
}
if (_carFrame == 52) {
} else if (_carFrame == 52) {
resetDogVariables();
_animationMode = 0;
_nextTrigger = 2;
}
if ((nextFrame >= 0) && (nextFrame != _scene->_activeAnimation->getCurrentFrame())) {
_scene->_activeAnimation->setCurrentFrame(nextFrame);
_carFrame = nextFrame;
}
}
}
if ((_carMode == 6) && (_scene->_activeAnimation != nullptr)) {
if (_scene->_activeAnimation->getCurrentFrame() != _carFrame) {
_carFrame = _scene->_activeAnimation->getCurrentFrame();
int nextFrame = -1;
if (_carFrame == 11) {
_game._player._visible = true;
_game._player._priorTimer = _scene->_activeAnimation->getNextFrameTimer() - _game._player._ticksAmount;
}
if (_carFrame == 41) {
} else if (_carFrame == 41) {
_globals._sequenceIndexes[10] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[10], false, 9, 0, 0, 0);
_scene->_sequences.setAnimRange(_globals._sequenceIndexes[10], 10, 11);
_scene->_sequences.setDepth(_globals._sequenceIndexes[10], 6);
_dogUnderCar = true;
_nextTrigger = 2;
}
if ((nextFrame >= 0) && (nextFrame != _scene->_activeAnimation->getCurrentFrame())) {
_scene->_activeAnimation->setCurrentFrame(nextFrame);
_carFrame = nextFrame;
}
}
}