aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2013-07-07 16:09:42 +0200
committerStrangerke2013-07-07 16:09:42 +0200
commit32c62aaf80497b24a141045aba2ceec0fd2eb60b (patch)
treeddcf774cfe53eae387d50582128432da0eb26925
parentba9b17fa35eba38fada396ab98e15f850a21895e (diff)
downloadscummvm-rg350-32c62aaf80497b24a141045aba2ceec0fd2eb60b.tar.gz
scummvm-rg350-32c62aaf80497b24a141045aba2ceec0fd2eb60b.tar.bz2
scummvm-rg350-32c62aaf80497b24a141045aba2ceec0fd2eb60b.zip
MORTEVIELLE: Some renaming in Mortevielle.h
-rw-r--r--engines/mortevielle/mortevielle.h8
-rw-r--r--engines/mortevielle/utils.cpp20
2 files changed, 14 insertions, 14 deletions
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 8f9df4a1e1..dcb61a6057 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -125,8 +125,8 @@ const int kArep = 1314;
const int kAmzon = 1650;
const int kArega = 0;
-const int kMaxTi = 9000;
-const int kMaxTd = 600;
+const int kMaxDialogIndex = 9000;
+const int kMaxDialogHint = 600;
const int kDescriptionStringIndex = 0; // Unused
const int kInventoryStringIndex = 186;
@@ -281,8 +281,8 @@ private:
int _openObjects[8];
int _nbrep[9];
int _nbrepm[9];
- uint16 _inpBuffer[kMaxTi + 1];
- Hint _ntpBuffer[kMaxTd + 1];
+ uint16 _dialogIndexArray[kMaxDialogIndex + 1];
+ Hint _dialogHintArray[kMaxDialogHint + 1];
Common::ErrorCode initialise();
Common::ErrorCode loadMortDat();
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 9b140fc761..78a4db8ad2 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -1849,13 +1849,13 @@ void MortevielleEngine::cinq_huit(char &c, int &idx, byte &pt, bool &the_end) {
uint16 oct, ocd;
/* 5-8 */
- oct = _inpBuffer[idx];
+ oct = _dialogIndexArray[idx];
oct = ((uint16)(oct << (16 - pt))) >> (16 - pt);
if (pt < 6) {
++idx;
oct = oct << (5 - pt);
pt += 11;
- oct = oct | ((uint)_inpBuffer[idx] >> pt);
+ oct = oct | ((uint)_dialogIndexArray[idx] >> pt);
} else {
pt -= 5;
oct = (uint)oct >> pt;
@@ -1865,13 +1865,13 @@ void MortevielleEngine::cinq_huit(char &c, int &idx, byte &pt, bool &the_end) {
c = '$';
the_end = true;
} else if (oct == 30 || oct == 31) {
- ocd = _inpBuffer[idx];
+ ocd = _dialogIndexArray[idx];
ocd = (uint16)(ocd << (16 - pt)) >> (16 - pt);
if (pt < 6) {
++idx;
ocd = ocd << (5 - pt);
pt += 11;
- ocd = ocd | ((uint)_inpBuffer[idx] >> pt);
+ ocd = ocd | ((uint)_dialogIndexArray[idx] >> pt);
} else {
pt -= 5;
ocd = (uint)ocd >> pt;
@@ -1903,8 +1903,8 @@ Common::String MortevielleEngine::getString(int num) {
} else if (!_txxFileFl) {
wrkStr = getGameString(num);
} else {
- int hint = _ntpBuffer[num]._hintId;
- byte point = _ntpBuffer[num]._point;
+ int hint = _dialogHintArray[num]._hintId;
+ byte point = _dialogHintArray[num]._point;
int length = 0;
bool endFl = false;
char let;
@@ -2116,20 +2116,20 @@ void MortevielleEngine::loadTexts() {
return;
}
- if ((inpFile.size() > (kMaxTi * 2)) || (ntpFile.size() > (kMaxTd * 3))) {
+ if ((inpFile.size() > (kMaxDialogIndex * 2)) || (ntpFile.size() > (kMaxDialogHint * 3))) {
warning("TXX file - Unexpected format - Switching to DAT file");
return;
}
for (int i = 0; i < inpFile.size() / 2; ++i)
- _inpBuffer[i] = inpFile.readUint16LE();
+ _dialogIndexArray[i] = inpFile.readUint16LE();
inpFile.close();
_txxFileFl = true;
for (int i = 0; i < (ntpFile.size() / 3); ++i) {
- _ntpBuffer[i]._hintId = ntpFile.readSint16LE();
- _ntpBuffer[i]._point = ntpFile.readByte();
+ _dialogHintArray[i]._hintId = ntpFile.readSint16LE();
+ _dialogHintArray[i]._point = ntpFile.readByte();
}
ntpFile.close();