aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2014-05-19 22:41:27 +0200
committerStrangerke2014-05-19 22:41:27 +0200
commit373b67e5be7688f5dd904c81a4a9702bf131c032 (patch)
treeda114705bc52145b32c10463a79cea97a1079b2d /engines
parent9613db3edf71787eb211076081281a9bc5c2f6ba (diff)
downloadscummvm-rg350-373b67e5be7688f5dd904c81a4a9702bf131c032.tar.gz
scummvm-rg350-373b67e5be7688f5dd904c81a4a9702bf131c032.tar.bz2
scummvm-rg350-373b67e5be7688f5dd904c81a4a9702bf131c032.zip
MADS: Some refactoring in scene 402
Diffstat (limited to 'engines')
-rw-r--r--engines/mads/nebular/nebular_scenes4.cpp23
1 files changed, 8 insertions, 15 deletions
diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp
index e8e9596e9d..79352fbb00 100644
--- a/engines/mads/nebular/nebular_scenes4.cpp
+++ b/engines/mads/nebular/nebular_scenes4.cpp
@@ -1232,13 +1232,8 @@ void Scene402::step() {
break;
case 53:
- if (_bigBeatFl) {
- _scene->_sequences.remove(_globals._sequenceIndexes[5]);
- _globals._sequenceIndexes[5] = _scene->_sequences.startCycle(_globals._spriteIndexes[5], false, 1);
- } else {
- _scene->_sequences.remove(_globals._sequenceIndexes[5]);
- _globals._sequenceIndexes[5] = _scene->_sequences.startCycle(_globals._spriteIndexes[5], false, 1);
- }
+ _scene->_sequences.remove(_globals._sequenceIndexes[5]);
+ _globals._sequenceIndexes[5] = _scene->_sequences.startCycle(_globals._spriteIndexes[5], false, 1);
_scene->_sequences.setDepth(_globals._sequenceIndexes[5], 1);
_waitingGinnyMove = false;
break;
@@ -1378,14 +1373,12 @@ void Scene402::step() {
}
}
- if (!_blowingSmoke) {
- if (_vm->getRandomNumber(1, 300) == 1) {
- _globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 8, 1, 0, 0);
- _scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], 1, 14);
- _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 14);
- _scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 30);
- _blowingSmoke = true;
- }
+ if (!_blowingSmoke && (_vm->getRandomNumber(1, 300) == 1)) {
+ _globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 8, 1, 0, 0);
+ _scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], 1, 14);
+ _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 14);
+ _scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 30);
+ _blowingSmoke = true;
}
switch (_game._trigger) {