aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2013-06-29 10:30:42 +0200
committerStrangerke2013-06-29 10:30:42 +0200
commit8e40527813433fb43f07ea45a02740219a40341b (patch)
tree6af479a310a61e27664e8292881e59d7b16c8aba /engines
parentfae077d848ddacc083cf37ed02ea8088f52f6f1b (diff)
downloadscummvm-rg350-8e40527813433fb43f07ea45a02740219a40341b.tar.gz
scummvm-rg350-8e40527813433fb43f07ea45a02740219a40341b.tar.bz2
scummvm-rg350-8e40527813433fb43f07ea45a02740219a40341b.zip
MORTEVIELLE: More renaming
Diffstat (limited to 'engines')
-rw-r--r--engines/mortevielle/actions.cpp8
-rw-r--r--engines/mortevielle/dialogs.cpp2
-rw-r--r--engines/mortevielle/mortevielle.h6
-rw-r--r--engines/mortevielle/utils.cpp17
4 files changed, 18 insertions, 15 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 7181d164f7..38cbb30927 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -509,7 +509,7 @@ void MortevielleEngine::fctSearch() {
if (_currBitIndex > 0)
_coreVar._faithScore += 3;
- rechai(_mchai);
+ _mchai = rechai();
if (_mchai != 0) {
_searchCount = 0;
_heroSearching = true;
@@ -893,8 +893,7 @@ void MortevielleEngine::fctClose() {
--_openObjCount;
if (_openObjCount < 0)
_openObjCount = 0;
- int chai = 9999;
- rechai(chai);
+ int chai = rechai();
if (_mchai == chai)
_mchai = 0;
} else {
@@ -976,8 +975,7 @@ void MortevielleEngine::fctSelfPut() {
setCoordinates(7);
_crep = 124;
if (_num != 0) {
- int chai;
- rechai(chai);
+ int chai = rechai();
if (chai == 0)
_crep = 997;
else {
diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
index c53b20fa5a..69cb81b4ef 100644
--- a/engines/mortevielle/dialogs.cpp
+++ b/engines/mortevielle/dialogs.cpp
@@ -447,7 +447,7 @@ int DialogManager::waitForF3F8() {
int key;
do {
- key = _vm->testou();
+ key = _vm->gettKeyPressed();
if (_vm->shouldQuit())
return key;
} while ((key != 61) && (key != 66));
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index e2d1a5eef2..e6f8a1f235 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -418,7 +418,6 @@ private:
void fctScratch();
void endGame();
void askRestart();
- void delay(int amount);
void handleOpcode();
void displayStatusArrow();
void displayStatusInDescriptionBar(char stat);
@@ -448,7 +447,7 @@ private:
void mennor();
void tsuiv();
void treg(int objId);
- void rechai(int &ch);
+ int rechai();
public:
Common::Point _prevPos;
@@ -510,6 +509,7 @@ public:
Common::String getEngineString(int idx) const { return _engineStrings[idx]; }
Common::String getGameString(int idx) const { return _gameStrings[idx]; }
+ void delay(int amount);
void gameLoaded();
void initGame();
void displayAloneText();
@@ -524,7 +524,7 @@ public:
void displayEmptyHand();
void hirs();
- int testou();
+ int gettKeyPressed();
void handleDescriptionText(int f, int mesgId);
int animof(int ouf, int num);
void pictout(int seg, int dep, int x, int y);
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 8eef2783ed..7756d913e5 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -3005,7 +3005,7 @@ void MortevielleEngine::testKey(bool d) {
// Wait for release from any key or mouse button
while (keyPressed())
- _key = testou();
+ _key = gettKeyPressed();
do {
_mouse.getMousePosition(x, y, click);
@@ -3022,7 +3022,7 @@ void MortevielleEngine::testKey(bool d) {
return;
} while (!(quest || (click) || (d && _anyone)));
if (quest)
- testou();
+ gettKeyPressed();
setMouseClick(false);
_mouse.showMouse();
}
@@ -3377,12 +3377,13 @@ void MortevielleEngine::putInHand(int &objId) {
}
}
-void MortevielleEngine::rechai(int &ch) {
+int MortevielleEngine::rechai() {
int tmpPlace = _coreVar._currPlace;
if (_coreVar._currPlace == CRYPT)
tmpPlace = CELLAR;
- ch = _tabdon[kAchai + (tmpPlace * 7) + _num - 1];
+
+ return _tabdon[kAchai + (tmpPlace * 7) + _num - 1];
}
/**
@@ -3424,10 +3425,14 @@ void MortevielleEngine::displayStatusInDescriptionBar(char stat) {
*/
void MortevielleEngine::testKeyboard() {
if (keyPressed())
- testou();
+ gettKeyPressed();
}
-int MortevielleEngine::testou() {
+/**
+ * Test Key Pressed
+ * @remarks Originally called 'testou'
+ */
+int MortevielleEngine::gettKeyPressed() {
char ch = getChar();
switch (ch) {