aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2012-03-24 22:48:47 +0100
committerStrangerke2012-04-06 08:23:51 +0200
commit26a38fb1e67a82b59b21b038c08dc3c5169eaa78 (patch)
tree8e16d3cb4f330c2bf6e0e54bd5f2e1d6007f3f10
parent4b9e71952c8384267251c31aae3fb5bcd34f7bff (diff)
downloadscummvm-rg350-26a38fb1e67a82b59b21b038c08dc3c5169eaa78.tar.gz
scummvm-rg350-26a38fb1e67a82b59b21b038c08dc3c5169eaa78.tar.bz2
scummvm-rg350-26a38fb1e67a82b59b21b038c08dc3c5169eaa78.zip
MORTEVIELLE: rename some constants
-rw-r--r--engines/mortevielle/actions.cpp10
-rw-r--r--engines/mortevielle/mortevielle.cpp4
-rw-r--r--engines/mortevielle/mortevielle.h14
3 files changed, 14 insertions, 14 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 1a6614953d..011728870c 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -349,7 +349,7 @@ void MortevielleEngine::fctLift() {
tmpPlace = 14;
else if (_coreVar._currPlace == MOUNTAIN)
tmpPlace = 15;
- _crep = _tabdon[asoul + (tmpPlace << 3) + (_num - 1)];
+ _crep = _tabdon[kAsoul + (tmpPlace << 3) + (_num - 1)];
if (_crep == 255)
_crep = 997;
}
@@ -443,7 +443,7 @@ void MortevielleEngine::fctLook() {
cx -= 4;
if (_coreVar._currPlace == ROOM26)
cx = 21;
- _crep = _tabdon[arega + (cx * 7) + _num - 1];
+ _crep = _tabdon[kArega + (cx * 7) + _num - 1];
if ((_coreVar._currPlace == ATTIC) && (_num == 8))
_crep = 126;
if (_coreVar._currPlace == MOUNTAIN)
@@ -631,7 +631,7 @@ void MortevielleEngine::fctOpen() {
tmpPlace = _coreVar._currPlace;
if (_coreVar._currPlace == CRYPT)
tmpPlace = CELLAR;
- _crep = _tabdon[aouvr + (tmpPlace * 7) + _num - 1];
+ _crep = _tabdon[kAouvr + (tmpPlace * 7) + _num - 1];
if (_crep == 254)
_crep = 999;
} else
@@ -1474,8 +1474,8 @@ void MortevielleEngine::fctDiscuss() {
_coreVar._faithScore += (3 * (_coreVar._faithScore / 10));
}
} else if (_nbrep[_caff - 69] < _nbrepm[_caff - 69]) {
- suj = _tabdon[arep + (ix << 3) + (_caff - 70)];
- _coreVar._faithScore += _tabdon[arcf + ix];
+ suj = _tabdon[kArep + (ix << 3) + (_caff - 70)];
+ _coreVar._faithScore += _tabdon[kArcf + ix];
++_nbrep[_caff - 69];
} else {
_coreVar._faithScore += 3;
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index fec14739c3..2c3313ea45 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -3582,7 +3582,7 @@ void MortevielleEngine::setCoordinates(int sx) {
_num = 0;
_crep = 999;
int a = 0;
- int atdon = amzon + 3;
+ int atdon = kAmzon + 3;
int cy = 0;
while (cy < _caff) {
a += _tabdon[atdon];
@@ -3664,7 +3664,7 @@ void MortevielleEngine::rechai(int &ch) {
if (_coreVar._currPlace == CRYPT)
tmpPlace = CELLAR;
- ch = _tabdon[achai + (tmpPlace * 7) + _num - 1];
+ ch = _tabdon[kAchai + (tmpPlace * 7) + _num - 1];
}
/**
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 514b929a22..98d4b042bb 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -110,13 +110,13 @@ const int kAcha = 492;
const int kAdrDes = 0x7000;
const int kFleche = 1758;
-const int asoul = 154;
-const int aouvr = 282;
-const int achai = 387;
-const int arcf = 1272;
-const int arep = 1314;
-const int amzon = 1650;
-const int arega = 0;
+const int kAsoul = 154;
+const int kAouvr = 282;
+const int kAchai = 387;
+const int kArcf = 1272;
+const int kArep = 1314;
+const int kAmzon = 1650;
+const int kArega = 0;
const int kMaxTi = 7975;
const int kMaxTd = 600;