aboutsummaryrefslogtreecommitdiff
path: root/engines/gnap
diff options
context:
space:
mode:
authorStrangerke2016-04-30 11:38:05 +0200
committerEugene Sandulenko2016-05-10 12:14:48 +0200
commit33b27b8db3b86fac77ef12a6cbda92050c5d3bd3 (patch)
treeb614e2102cb856f73f56357ca72e6c96d1cc4572 /engines/gnap
parent25fc9c0a1390c51f4a35f596b4a87b315d520a25 (diff)
downloadscummvm-rg350-33b27b8db3b86fac77ef12a6cbda92050c5d3bd3.tar.gz
scummvm-rg350-33b27b8db3b86fac77ef12a6cbda92050c5d3bd3.tar.bz2
scummvm-rg350-33b27b8db3b86fac77ef12a6cbda92050c5d3bd3.zip
GNAP: Fix regression
Diffstat (limited to 'engines/gnap')
-rw-r--r--engines/gnap/scenes/arcade.cpp10
-rw-r--r--engines/gnap/scenes/group4.cpp40
2 files changed, 25 insertions, 25 deletions
diff --git a/engines/gnap/scenes/arcade.cpp b/engines/gnap/scenes/arcade.cpp
index a857427f3d..f16fc6d2a7 100644
--- a/engines/gnap/scenes/arcade.cpp
+++ b/engines/gnap/scenes/arcade.cpp
@@ -62,7 +62,7 @@ Scene49::Scene49(GnapEngine *vm) : Scene(vm) {
}
int Scene49::init() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
gameSys.setAnimation(0, 0, 0);
gameSys.setAnimation(0, 0, 1);
@@ -158,9 +158,9 @@ void Scene49::checkObstacles() {
}
void Scene49::updateObstacle(int id) {
- GameSys gameSys = *_vm->_gameSys;
- Scene49Obstacle &obstacle = _obstacles[id];
+ GameSys& gameSys = *_vm->_gameSys;
+ Scene49Obstacle &obstacle = _obstacles[id];
obstacle._currId = obstacle._prevId;
switch (obstacle._laneNum) {
@@ -283,7 +283,7 @@ void Scene49::clearObstacle(int index) {
}
void Scene49::run() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
bool animToggle6 = false;
bool animToggle5 = false;
@@ -507,7 +507,7 @@ void Scene49::run() {
}
void Scene49::updateAnimations() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
for (int i = 0; i < 5; ++i) {
if (gameSys.getAnimationStatus(i + 2) == 2) {
diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp
index d84717e43b..c42119cb51 100644
--- a/engines/gnap/scenes/group4.cpp
+++ b/engines/gnap/scenes/group4.cpp
@@ -31,7 +31,7 @@ Scene40::Scene40(GnapEngine *vm) : Scene(vm) {
}
int Scene40::init() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
gameSys.setAnimation(0, 0, 0);
gameSys.setAnimation(0, 0, 1);
@@ -167,7 +167,7 @@ void Scene40::run() {
}
void Scene40::updateAnimations() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
if (gameSys.getAnimationStatus(0) == 2) {
gameSys.setAnimation(0, 0, 0);
@@ -188,7 +188,7 @@ Scene41::Scene41(GnapEngine *vm) : Scene(vm) {
}
int Scene41::init() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
gameSys.setAnimation(0, 0, 0);
gameSys.setAnimation(0, 0, 1);
@@ -219,7 +219,7 @@ void Scene41::updateHotspots() {
}
void Scene41::run() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
_vm->queueInsertDeviceIcon();
@@ -560,7 +560,7 @@ void Scene41::run() {
}
void Scene41::updateAnimations() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
if (gameSys.getAnimationStatus(0) == 2) {
switch (_vm->_gnapActionStatus) {
@@ -715,7 +715,7 @@ Scene42::Scene42(GnapEngine *vm) : Scene(vm) {
}
int Scene42::init() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
gameSys.setAnimation(0, 0, 0);
gameSys.setAnimation(0, 0, 1);
@@ -750,7 +750,7 @@ void Scene42::updateHotspots() {
}
void Scene42::run() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
_vm->queueInsertDeviceIcon();
@@ -1024,7 +1024,7 @@ void Scene42::run() {
}
void Scene42::updateAnimations() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
if (gameSys.getAnimationStatus(0) == 2) {
switch (_vm->_gnapActionStatus) {
@@ -1160,7 +1160,7 @@ Scene43::Scene43(GnapEngine *vm) : Scene(vm) {
}
int Scene43::init() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
gameSys.setAnimation(0, 0, 0);
gameSys.setAnimation(0, 0, 1);
@@ -1200,7 +1200,7 @@ void Scene43::updateHotspots() {
}
void Scene43::run() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
_vm->queueInsertDeviceIcon();
@@ -1480,7 +1480,7 @@ void Scene43::run() {
}
void Scene43::updateAnimations() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
if (gameSys.getAnimationStatus(0) == 2) {
switch (_vm->_gnapActionStatus) {
@@ -1597,7 +1597,7 @@ Scene44::Scene44(GnapEngine *vm) : Scene(vm) {
}
int Scene44::init() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
gameSys.setAnimation(0, 0, 0);
gameSys.setAnimation(0, 0, 1);
@@ -1633,7 +1633,7 @@ void Scene44::updateHotspots() {
}
void Scene44::run() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
_vm->queueInsertDeviceIcon();
@@ -1977,7 +1977,7 @@ void Scene44::run() {
}
void Scene44::updateAnimations() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
if (gameSys.getAnimationStatus(0) == 2) {
gameSys.setAnimation(0, 0, 0);
@@ -2074,7 +2074,7 @@ Scene45::Scene45(GnapEngine *vm) : Scene(vm) {
}
int Scene45::init() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
gameSys.setAnimation(0, 0, 0);
gameSys.setAnimation(0, 0, 1);
@@ -2115,7 +2115,7 @@ void Scene45::updateHotspots() {
}
void Scene45::run() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
if (!_vm->isSoundPlaying(0x1094A))
_vm->playSound(0x1094A, true);
@@ -2381,7 +2381,7 @@ void Scene45::run() {
}
void Scene45::updateAnimations() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
if (gameSys.getAnimationStatus(0) == 2) {
gameSys.setAnimation(0, 0, 0);
@@ -2457,7 +2457,7 @@ Scene46::Scene46(GnapEngine *vm) : Scene(vm) {
}
int Scene46::init() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
gameSys.setAnimation(0, 0, 0);
gameSys.setAnimation(0, 0, 1);
@@ -2488,7 +2488,7 @@ void Scene46::updateHotspots() {
}
void Scene46::run() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
_vm->queueInsertDeviceIcon();
gameSys.insertSequence(0x4D, 0, 0, 0, kSeqLoop, 0, 0, 0);
@@ -2725,7 +2725,7 @@ void Scene46::run() {
}
void Scene46::updateAnimations() {
- GameSys gameSys = *_vm->_gameSys;
+ GameSys& gameSys = *_vm->_gameSys;
if (gameSys.getAnimationStatus(0) == 2) {
gameSys.setAnimation(0, 0, 0);