aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/mortevielle/actions.cpp36
-rw-r--r--engines/mortevielle/mortevielle.h4
-rw-r--r--engines/mortevielle/utils.cpp6
3 files changed, 25 insertions, 21 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 9026df8470..bc811811d0 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -49,7 +49,7 @@ void MortevielleEngine::fctMove() {
if ((_coreVar._currPlace == LANDING) && (_msg[4] == _menu._moveMenu[6])) {
if (!_syn)
displayTextInVerbBar(getEngineString(S_GO_TO));
- tfleche();
+ displayStatusArrow();
if (_keyPressedEsc)
_destinationOk = false;
@@ -218,7 +218,7 @@ void MortevielleEngine::fctTake() {
}
if (!_syn)
displayTextInVerbBar(getEngineString(S_TAKE));
- tfleche();
+ displayStatusArrow();
if ((_anyone) || (_keyPressedEsc))
return;
if (_caff == 3) {
@@ -324,7 +324,7 @@ void MortevielleEngine::fctInventoryTake() {
void MortevielleEngine::fctLift() {
if (!_syn)
displayTextInVerbBar(getEngineString(S_LIFT));
- tfleche();
+ displayStatusArrow();
if ((_anyone) || (_keyPressedEsc))
return;
setCoordinates(3);
@@ -361,7 +361,7 @@ void MortevielleEngine::fctRead() {
else {
if (!_syn)
displayTextInVerbBar(getEngineString(S_READ));
- tfleche();
+ displayStatusArrow();
if (!(_anyone) && !(_keyPressedEsc)) {
setCoordinates(4);
if (_num != 0)
@@ -394,7 +394,7 @@ void MortevielleEngine::fctLook() {
}
if (!_syn)
displayTextInVerbBar(getEngineString(S_LOOK));
- tfleche();
+ displayStatusArrow();
if ((_anyone) || (_keyPressedEsc))
return;
setCoordinates(5);
@@ -485,7 +485,7 @@ void MortevielleEngine::fctSearch() {
if (!_syn)
displayTextInVerbBar(getEngineString(S_SEARCH));
- tfleche();
+ displayStatusArrow();
if (_anyone || _keyPressedEsc)
return;
@@ -595,7 +595,7 @@ void MortevielleEngine::fctOpen() {
return;
}
- tfleche();
+ displayStatusArrow();
if ((_anyone) || (_keyPressedEsc))
return;
@@ -659,7 +659,7 @@ void MortevielleEngine::fctPlace() {
if (!_syn)
displayTextInVerbBar(getEngineString(S_PUT));
- tfleche();
+ displayStatusArrow();
if (_keyPressedEsc)
_crep = 998;
@@ -791,7 +791,7 @@ void MortevielleEngine::fctTurn() {
}
if (!_syn)
displayTextInVerbBar(getEngineString(S_TURN));
- tfleche();
+ displayStatusArrow();
if ((_anyone) || (_keyPressedEsc))
return;
setCoordinates(9);
@@ -827,7 +827,7 @@ void MortevielleEngine::fctTurn() {
void MortevielleEngine::fctSelfHide() {
if (!_syn)
displayTextInVerbBar(getEngineString(S_HIDE_SELF));
- tfleche();
+ displayStatusArrow();
if (!(_anyone) && !(_keyPressedEsc)) {
setCoordinates(10);
if (_num == 0)
@@ -849,7 +849,7 @@ void MortevielleEngine::fctAttach() {
else {
if (!_syn)
displayTextInVerbBar(getEngineString(S_TIE));
- tfleche();
+ displayStatusArrow();
if (!(_anyone) && !(_keyPressedEsc)) {
setCoordinates(8);
_crep = 997;
@@ -875,7 +875,7 @@ void MortevielleEngine::fctClose() {
displayTextInVerbBar(getEngineString(S_CLOSE));
if (_caff < ROOM26) {
- tfleche();
+ displayStatusArrow();
if (_keyPressedEsc)
_crep = 998;
if ((_anyone) || (_keyPressedEsc))
@@ -920,7 +920,7 @@ void MortevielleEngine::fctKnock() {
}
if (_coreVar._currPlace < DOOR) {
- tfleche();
+ displayStatusArrow();
if (!(_anyone) && !(_keyPressedEsc)) {
if ((_coreVar._currPlace < MOUNTAIN) && (_coreVar._currPlace != LANDING))
_crep = 133;
@@ -970,7 +970,7 @@ void MortevielleEngine::fctSelfPut() {
displayEmptyHand();
return;
}
- tfleche();
+ displayStatusArrow();
if ((_anyone) || (_keyPressedEsc))
return;
setCoordinates(7);
@@ -1240,7 +1240,7 @@ void MortevielleEngine::fctForce() {
if (!_syn)
displayTextInVerbBar(getEngineString(S_SMASH));
if (_caff < DOOR)
- tfleche();
+ displayStatusArrow();
if ((!_anyone) && (!_keyPressedEsc)) {
if (_coreVar._currPlace != ROOM26)
@@ -1330,7 +1330,7 @@ void MortevielleEngine::fctSound() {
if (!_syn)
displayTextInVerbBar(getEngineString(S_PROBE2));
if (_caff < 27) {
- tfleche();
+ displayStatusArrow();
if (!(_anyone) && (!_keyPressedEsc))
_crep = 145;
_num = 0;
@@ -1552,7 +1552,7 @@ void MortevielleEngine::fctSmell() {
if (_caff < ROOM26) {
if (!_syn)
displayTextInVerbBar(getEngineString(S_SMELL));
- tfleche();
+ displayStatusArrow();
if (!(_anyone) && !(_keyPressedEsc))
if (_caff == CRYPT)
_crep = 153;
@@ -1570,7 +1570,7 @@ void MortevielleEngine::fctScratch() {
if (_caff < 27) {
if (!_syn)
displayTextInVerbBar(getEngineString(S_SCRATCH));
- tfleche();
+ displayStatusArrow();
}
_num = 0;
}
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index d4d57d84b7..74c1bc7e4a 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -420,6 +420,8 @@ private:
void askRestart();
void delay(int amount);
void handleOpcode();
+ void displayStatusArrow();
+ void displayStatusInDescriptionBar(char stat);
void displayTextInDescriptionBar(int x, int y, int nb, int mesgId);
void mapMessageId(int &mesgId);
@@ -438,7 +440,6 @@ private:
void writetp(Common::String s, int t);
void premtet();
void ajchai();
- void tfleche();
void ecr2(Common::String text);
void init_nbrepm();
void aniof(int ouf, int num);
@@ -448,7 +449,6 @@ private:
void tsuiv();
void treg(int objId);
void rechai(int &ch);
- void displayStatusInDescriptionBar(char stat);
public:
Common::Point _prevPos;
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index a0b7cf3d5e..bf524b6a39 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -3240,7 +3240,11 @@ void MortevielleEngine::tsuiv() {
}
}
-void MortevielleEngine::tfleche() {
+/**
+ * Display Arrow status
+ * @remarks Originally called 'tfleche'
+ */
+void MortevielleEngine::displayStatusArrow() {
bool qust;
char touch;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 04:30:59 +0000