aboutsummaryrefslogtreecommitdiff
path: root/engines/gnap/scenes/intro.cpp
diff options
context:
space:
mode:
authorStrangerke2016-04-30 13:37:57 +0200
committerEugene Sandulenko2016-05-10 12:14:48 +0200
commitce8e3281d4578d3f0833e8ce449fe6a9e6b4791e (patch)
treefa3f5a04982dc40d21d3668489c510b434647af6 /engines/gnap/scenes/intro.cpp
parent33b27b8db3b86fac77ef12a6cbda92050c5d3bd3 (diff)
downloadscummvm-rg350-ce8e3281d4578d3f0833e8ce449fe6a9e6b4791e.tar.gz
scummvm-rg350-ce8e3281d4578d3f0833e8ce449fe6a9e6b4791e.tar.bz2
scummvm-rg350-ce8e3281d4578d3f0833e8ce449fe6a9e6b4791e.zip
GNAP: Reduce dereferencing of _gameSys
Diffstat (limited to 'engines/gnap/scenes/intro.cpp')
-rw-r--r--engines/gnap/scenes/intro.cpp27
1 files changed, 14 insertions, 13 deletions
diff --git a/engines/gnap/scenes/intro.cpp b/engines/gnap/scenes/intro.cpp
index 0463f12ac6..fa23d6a2b3 100644
--- a/engines/gnap/scenes/intro.cpp
+++ b/engines/gnap/scenes/intro.cpp
@@ -55,6 +55,7 @@ void SceneIntro::run() {
0x1A, 0x14, 0x15, 0x16, 0x14,
0x19, 0};
+ GameSys& gameSys = *_vm->_gameSys;
int index = 0;
bool skip = false;
@@ -121,35 +122,35 @@ void SceneIntro::run() {
delete videoDecoder;
- _vm->_gameSys->drawSpriteToBackground(0, 0, backgroundIdArr[index]);
- _vm->_gameSys->insertSequence(0x356, 2, 0, 0, kSeqNone, 0, 0, 0);
- _vm->_gameSys->setAnimation(0x356, 2, 0);
+ gameSys.drawSpriteToBackground(0, 0, backgroundIdArr[index]);
+ gameSys.insertSequence(0x356, 2, 0, 0, kSeqNone, 0, 0, 0);
+ gameSys.setAnimation(0x356, 2, 0);
while (!_vm->_sceneDone) {
_vm->gameUpdateTick();
- if (_vm->_gameSys->getAnimationStatus(0) == 2 || skip ) {
+ if (gameSys.getAnimationStatus(0) == 2 || skip ) {
skip = false;
- _vm->_gameSys->requestClear2(false);
- _vm->_gameSys->requestClear1();
+ gameSys.requestClear2(false);
+ gameSys.requestClear1();
if ( index == 11 || index == 1 )
_vm->screenEffect(0, 0, 0, 0);
- _vm->_gameSys->setAnimation(0, 0, 0);
+ gameSys.setAnimation(0, 0, 0);
if (++index >= 31)
_vm->_sceneDone = true;
else {
- _vm->_gameSys->insertSequence(animIdArr[index], 2, 0, 0, kSeqNone, 0, 0, 0);
+ gameSys.insertSequence(animIdArr[index], 2, 0, 0, kSeqNone, 0, 0, 0);
if (index == 2) {
_vm->playSound(0x10000, false);
- _vm->_gameSys->insertSequence(0x359, 2, 0, 0, 0, 0, 0, 0);
+ gameSys.insertSequence(0x359, 2, 0, 0, 0, 0, 0, 0);
} else if (index == 3)
- _vm->_gameSys->insertSequence(0x35B, 2, 0, 0, kSeqNone, 0, 0, 0);
+ gameSys.insertSequence(0x35B, 2, 0, 0, kSeqNone, 0, 0, 0);
else if (index == 12)
- _vm->_gameSys->insertSequence(0x36A, 2, 0, 0, kSeqNone, 0, 0, 0);
+ gameSys.insertSequence(0x36A, 2, 0, 0, kSeqNone, 0, 0, 0);
- _vm->_gameSys->drawSpriteToBackground(0, 0, backgroundIdArr[index]);
- _vm->_gameSys->setAnimation(animIdArr[index], 2, 0);
+ gameSys.drawSpriteToBackground(0, 0, backgroundIdArr[index]);
+ gameSys.setAnimation(animIdArr[index], 2, 0);
if (index == 11)
_vm->stopSound(0x10000);