aboutsummaryrefslogtreecommitdiff
path: root/engines/access/amazon/amazon_logic.cpp
diff options
context:
space:
mode:
authorStrangerke2014-12-11 07:58:05 +0100
committerPaul Gilbert2014-12-12 23:07:35 -0500
commita6cc9250d329ab0d56c49dd24018ac1c84a723dc (patch)
treebd641dac1d6a84648b4d56cea5dd96abe50d0a9a /engines/access/amazon/amazon_logic.cpp
parent41d0908606469ebbac5d8b3a6442e70a5e778b7f (diff)
downloadscummvm-rg350-a6cc9250d329ab0d56c49dd24018ac1c84a723dc.tar.gz
scummvm-rg350-a6cc9250d329ab0d56c49dd24018ac1c84a723dc.tar.bz2
scummvm-rg350-a6cc9250d329ab0d56c49dd24018ac1c84a723dc.zip
ACCESS: Remove a useless variable, some renaming
Diffstat (limited to 'engines/access/amazon/amazon_logic.cpp')
-rw-r--r--engines/access/amazon/amazon_logic.cpp12
1 files changed, 6 insertions, 6 deletions
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;
}
}