aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/access/amazon/amazon_game.cpp13
-rw-r--r--engines/access/amazon/amazon_game.h1
-rw-r--r--engines/access/amazon/amazon_logic.cpp12
-rw-r--r--engines/access/amazon/amazon_logic.h2
4 files changed, 14 insertions, 14 deletions
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 802cb3887d..ff16bbfa94 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -55,7 +55,6 @@ AccessEngine(syst, gameDesc),
_inactiveYOff = 0;
_hintLevel = 0;
- Common::fill(&_esTabTable[0], &_esTabTable[100], 0);
memset(_tileData, 0, sizeof(_tileData));
Common::fill(&_help1[0], &_help1[366], 0);
Common::fill(&_help2[0], &_help2[366], 0);
@@ -415,11 +414,11 @@ void AmazonEngine::helpTitle() {
Common::String iqText = "IQ: ";
calcIQ();
- Common::String IQSCORE = Common::String::format("%d", _iqValue);
- while (IQSCORE.size() != 4)
- IQSCORE = " " + IQSCORE;
+ Common::String scoreIQ = Common::String::format("%d", _iqValue);
+ while (scoreIQ.size() < 4)
+ scoreIQ = " " + scoreIQ;
- iqText += IQSCORE;
+ iqText += scoreIQ;
int index = _iqValue;
if (index == 170)
index = 169;
@@ -768,8 +767,10 @@ void AmazonEngine::synchronize(Common::Serializer &s) {
s.syncAsSint16LE(_rawInactiveY);
s.syncAsSint16LE(_inactiveYOff);
+ int dummy = 0;
for (int i = 0; i < 100; ++i)
- s.syncAsSint16LE(_esTabTable[i]);
+ s.syncAsSint16LE(dummy);
+
for (int i = 0; i < 366; ++i) {
s.syncAsByte(_help1[i]);
s.syncAsByte(_help2[i]);
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 4ebea0f7eb..5d87cc434e 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -93,7 +93,6 @@ public:
int _rawInactiveX;
int _rawInactiveY;
int _inactiveYOff;
- int _esTabTable[100];
// Other game specific fields
Ant *_ant;
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 517351f7c3..2aed0bcafb 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1349,7 +1349,7 @@ void Cast::doCast(int param1) {
/*------------------------------------------------------------------------*/
River::River(AmazonEngine *vm): PannedScene(vm) {
- _CHICKENOUTFLG = false;
+ _chickenOutFl = false;
_rScrollRow = 0;
_rScrollCol = 0;
_rScrollX = 0;
@@ -1592,7 +1592,7 @@ void River::moveCanoe() {
}
} else if (events._leftButton && mousePos.x < 35 && mousePos.y < 12) {
// Clicked on the Skip button. So chicken out
- _CHICKENOUTFLG = true;
+ _chickenOutFl = true;
} else if ((events._leftButton && pt.y <= _canoeYPos) ||
(!events._leftButton && _vm->_player->_move == UP)) {
// Move canoe up
@@ -1833,15 +1833,15 @@ void River::doRiver() {
if (_vm->_screen->_scrollX == 0) {
_vm->_midi->midiRepeat();
if (riverJumpTest()) {
- _CHICKENOUTFLG = false;
+ _chickenOutFl = false;
return;
}
} else {
_vm->_screen->_scrollX -= _vm->_player->_scrollAmount;
}
- if (_CHICKENOUTFLG) {
- _CHICKENOUTFLG = false;
+ if (_chickenOutFl) {
+ _chickenOutFl = false;
return;
}
@@ -1886,7 +1886,7 @@ void River::doRiver() {
if (_vm->_room->_function == FN_CLEAR1) {
_vm->_scripts->_endFlag = true;
_vm->_scripts->_returnCode = 0;
- _CHICKENOUTFLG = false;
+ _chickenOutFl = false;
break;
}
}
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index d66a8d818e..8fb6df9354 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -158,7 +158,7 @@ public:
class River: public PannedScene {
private:
- bool _CHICKENOUTFLG;
+ bool _chickenOutFl;
const byte *_mapPtr;
int _canoeVXPos;
int _canoeMoveCount;