aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/mortevielle/actions.cpp31
-rw-r--r--engines/mortevielle/actions.h12
-rw-r--r--engines/mortevielle/mor2.cpp2
-rw-r--r--engines/mortevielle/mor2.h6
-rw-r--r--engines/mortevielle/prog.cpp143
-rw-r--r--engines/mortevielle/var_mor.h17
6 files changed, 110 insertions, 101 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 80a460e0c2..63f432b81a 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -288,8 +288,11 @@ void fctTake() {
crep = 120;
}
}
-
-void tsprendre() {
+/**
+ * Engine function - Inventory / Take
+ * @remarks Originally called 'tsprendre'
+ */
+void fctInventoryTake() {
int cx, cy, cz;
cx = 0;
@@ -366,7 +369,11 @@ void fctRead() {
}
}
-void tslire() {
+/**
+ * Engine function - Self / Read
+ * @remarks Originally called 'tslire'
+ */
+void fctSelfRead() {
if (s.derobj == 0)
crep = 186;
else
@@ -451,7 +458,11 @@ void fctLook() {
treg(31);
}
-void tsregarder() {
+/**
+ * Engine function - Self / Look
+ * @remarks Originally called 'tsregarder'
+ */
+void fctSelftLook() {
if (s.derobj != 0)
treg(s.derobj);
else
@@ -544,7 +555,11 @@ void fctSearch() {
}
}
-void tsfouiller() {
+/**
+ * Engine function - Self / Search
+ * @remarks Originally called 'tsfouiller'
+ */
+void fctSelfSearch() {
if (s.derobj != 0)
st7(s.derobj);
else
@@ -782,7 +797,7 @@ void fctTurn() {
* Engine function - Hide Self
* @remarks Originally called 'tcacher'
*/
-void fctHideSelf() {
+void fctSelfHide() {
if (!syn)
ecr3(g_vm->getEngineString(S_HIDE_SELF));
tfleche();
@@ -906,10 +921,10 @@ void fctKnock() {
}
/**
- * Engine function - Put
+ * Engine function - Self / Put
* @remarks Originally called 'tposer'
*/
-void fctPut() {
+void fctSelfPut() {
int cx, chai;
if (!syn)
diff --git a/engines/mortevielle/actions.h b/engines/mortevielle/actions.h
index e73dc080f5..74d4e5c046 100644
--- a/engines/mortevielle/actions.h
+++ b/engines/mortevielle/actions.h
@@ -33,22 +33,22 @@ namespace Mortevielle {
/* NIVEAU 4 */
extern void fctMove();
extern void fctTake();
-extern void tsprendre();
+extern void fctInventoryTake();
extern void fctLift();
extern void fctRead();
-extern void tslire();
+extern void fctSelfRead();
extern void fctLook();
-extern void tsregarder();
+extern void fctSelftLook();
extern void fctSearch();
-extern void tsfouiller();
+extern void fctSelfSearch();
extern void fctOpen();
extern void fctPlace();
extern void fctTurn();
-extern void fctHideSelf();
+extern void fctSelfHide();
extern void fctAttach();
extern void fctClose();
extern void fctKnock();
-extern void fctPut();
+extern void fctSelfPut();
extern void fctListen();
extern void fctEat();
extern void fctEnter();
diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp
index 86360b018b..33016faba9 100644
--- a/engines/mortevielle/mor2.cpp
+++ b/engines/mortevielle/mor2.cpp
@@ -737,7 +737,7 @@ void treg(int ob) {
mdes = caff;
caff = ob;
- if (((caff > 29) && (caff < 33)) || (caff == 144) || (caff == 147) || (caff == 149) || (msg[4] == sregarder)) {
+ if (((caff > 29) && (caff < 33)) || (caff == 144) || (caff == 147) || (caff == 149) || (msg[4] == OPCODE_SLOOK)) {
afdes(0);
if ((caff > 29) && (caff < 33))
repon(2, caff);
diff --git a/engines/mortevielle/mor2.h b/engines/mortevielle/mor2.h
index 2df20b7804..8dc0e1a974 100644
--- a/engines/mortevielle/mor2.h
+++ b/engines/mortevielle/mor2.h
@@ -33,9 +33,9 @@
namespace Mortevielle {
static const int _actionMenu[12] = { OPCODE_NONE,
- OPCODE_HIDE_SELF, OPCODE_ATTACH, OPCODE_FORCE, OPCODE_SLEEP,
- OPCODE_ENTER, OPCODE_CLOSE, OPCODE_KNOCK, OPCODE_EAT,
- OPCODE_PLACE, OPCODE_OPEN, OPCODE_LEAVE
+ OPCODE_SHIDE, OPCODE_ATTACH, OPCODE_FORCE, OPCODE_SLEEP,
+ OPCODE_ENTER, OPCODE_CLOSE, OPCODE_KNOCK, OPCODE_EAT,
+ OPCODE_PLACE, OPCODE_OPEN, OPCODE_LEAVE
};
extern void tinke();
diff --git a/engines/mortevielle/prog.cpp b/engines/mortevielle/prog.cpp
index cd7bb2a050..4953f86a00 100644
--- a/engines/mortevielle/prog.cpp
+++ b/engines/mortevielle/prog.cpp
@@ -163,81 +163,80 @@ void tsitu() {
clsf2();
syn = false;
iesc = false;
- if (anyone)
- goto L1;
- if (brt)
- if ((msg[3] == MENU_MOVE) || (msg[4] == OPCODE_LEAVE) || (msg[4] == OPCODE_SLEEP) || (msg[4] == OPCODE_EAT)) {
- ctrm = 4;
+ if (!anyone) {
+ if (brt)
+ if ((msg[3] == MENU_MOVE) || (msg[4] == OPCODE_LEAVE) || (msg[4] == OPCODE_SLEEP) || (msg[4] == OPCODE_EAT)) {
+ ctrm = 4;
+ mennor();
+ return;
+ }
+ if (msg[3] == MENU_MOVE)
+ fctMove();
+ if (msg[3] == MENU_DISCUSS)
+ fctDiscuss();
+ if (msg[3] == MENU_INVENTORY)
+ fctInventoryTake();
+ if (msg[4] == OPCODE_ATTACH)
+ fctAttach();
+ if (msg[4] == OPCODE_WAIT)
+ fctWait();
+ if (msg[4] == OPCODE_FORCE)
+ fctForce();
+ if (msg[4] == OPCODE_SLEEP)
+ fctSleep();
+ if (msg[4] == OPCODE_LISTEN)
+ fctListen();
+ if (msg[4] == OPCODE_ENTER)
+ fctEnter();
+ if (msg[4] == OPCODE_CLOSE)
+ fctClose();
+ if (msg[4] == OPCODE_SEARCH)
+ fctSearch();
+ if (msg[4] == OPCODE_KNOCK)
+ fctKnock();
+ if (msg[4] == OPCODE_SCRATCH)
+ fctScratch();
+ if (msg[4] == OPCODE_READ)
+ fctRead();
+ if (msg[4] == OPCODE_EAT)
+ fctEat();
+ if (msg[4] == OPCODE_PLACE)
+ fctPlace();
+ if (msg[4] == OPCODE_OPEN)
+ fctOpen();
+ if (msg[4] == OPCODE_TAKE)
+ fctTake();
+ if (msg[4] == OPCODE_LOOK)
+ fctLook();
+ if (msg[4] == OPCODE_SMELL)
+ fctSmell();
+ if (msg[4] == OPCODE_SOUND)
+ fctSound();
+ if (msg[4] == OPCODE_LEAVE)
+ fctLeave();
+ if (msg[4] == OPCODE_LIFT)
+ fctLift();
+ if (msg[4] == OPCODE_TURN)
+ fctTurn();
+ if (msg[4] == OPCODE_SSEARCH)
+ fctSelfSearch();
+ if (msg[4] == OPCODE_SREAD)
+ fctSelfRead();
+ if (msg[4] == OPCODE_SPUT)
+ fctSelfPut();
+ if (msg[4] == OPCODE_SLOOK)
+ fctSelftLook();
+ cache = false;
+
+ if (msg[4] == OPCODE_SHIDE)
+ fctSelfHide();
+ } else {
+ if (anyone) {
+ quelquun();
+ anyone = false;
mennor();
return;
}
- if (msg[3] == MENU_MOVE)
- fctMove();
- if (msg[3] == MENU_DISCUSS)
- fctDiscuss();
- if (msg[3] == MENU_INVENTORY)
- tsprendre(); //Translation: inventory/take
- if (msg[4] == OPCODE_ATTACH)
- fctAttach();
- if (msg[4] == OPCODE_WAIT)
- fctWait();
- if (msg[4] == OPCODE_FORCE)
- fctForce();
- if (msg[4] == OPCODE_SLEEP)
- fctSleep();
- if (msg[4] == OPCODE_LISTEN)
- fctListen();
- if (msg[4] == OPCODE_ENTER)
- fctEnter();
- if (msg[4] == OPCODE_CLOSE)
- fctClose();
- if (msg[4] == OPCODE_SEARCH)
- fctSearch();
- if (msg[4] == OPCODE_KNOCK)
- fctKnock();
- if (msg[4] == OPCODE_SCRATCH)
- fctScratch();
- if (msg[4] == OPCODE_READ)
- fctRead();
- if (msg[4] == OPCODE_EAT)
- fctEat();
- if (msg[4] == OPCODE_PLACE)
- fctPlace();
- if (msg[4] == OPCODE_OPEN)
- fctOpen();
- if (msg[4] == OPCODE_TAKE)
- fctTake();
- if (msg[4] == OPCODE_LOOK)
- fctLook();
- if (msg[4] == OPCODE_SMELL)
- fctSmell();
- if (msg[4] == OPCODE_SOUND)
- fctSound();
- if (msg[4] == OPCODE_LEAVE)
- fctLeave();
- if (msg[4] == OPCODE_LIFT)
- fctLift();
- if (msg[4] == OPCODE_TURN)
- fctTurn();
- if (msg[4] == OPCODE_HIDE_SELF) {
- fctHideSelf();
- goto L1;
- }
- if (msg[4] == sfouiller)
- tsfouiller();//Translation: search
- if (msg[4] == slire)
- tslire(); //Translation: read
- if (msg[4] == OPCODE_PUT)
- fctPut();
- if (msg[4] == sregarder)
- tsregarder();//Translation: look
- cache = false;
-L1:
- if (anyone) {
- quelquun();
- anyone = false;
- mennor();
- return;
}
calch(j, h, m);
if ((((h == 12) || (h == 13) || (h == 19)) && (s.mlieu != 10)) ||
diff --git a/engines/mortevielle/var_mor.h b/engines/mortevielle/var_mor.h
index d6024ece24..d9a11f5528 100644
--- a/engines/mortevielle/var_mor.h
+++ b/engines/mortevielle/var_mor.h
@@ -129,17 +129,12 @@ const int fleche = 1758;
const int OPCODE_NONE = 0;
-enum verbs {OPCODE_ATTACH = 0x301, OPCODE_WAIT = 0x302, OPCODE_FORCE = 0x303, OPCODE_SLEEP = 0x304, OPCODE_LISTEN = 0x305,
- OPCODE_ENTER = 0x306, OPCODE_CLOSE = 0x307, OPCODE_SEARCH = 0x308, OPCODE_KNOCK = 0x309, OPCODE_SCRATCH = 0x30a,
- OPCODE_READ = 0x30b, OPCODE_EAT = 0x30c, OPCODE_PLACE = 0x30d, OPCODE_OPEN = 0x30e, OPCODE_TAKE = 0x30f,
- OPCODE_LOOK = 0x310, OPCODE_SMELL = 0x311, OPCODE_SOUND = 0x312, OPCODE_LEAVE = 0x313, OPCODE_LIFT = 0x314,
- OPCODE_TURN = 0x315};
-
-enum verbs2 {OPCODE_HIDE_SELF = 0x401, OPCODE_PUT = 0x404};
-
-const int sfouiller = 0x402;
-const int slire = 0x403;
-const int sregarder = 0x405;
+enum verbs {OPCODE_ATTACH = 0x301, OPCODE_WAIT = 0x302, OPCODE_FORCE = 0x303, OPCODE_SLEEP = 0x304, OPCODE_LISTEN = 0x305,
+ OPCODE_ENTER = 0x306, OPCODE_CLOSE = 0x307, OPCODE_SEARCH = 0x308, OPCODE_KNOCK = 0x309, OPCODE_SCRATCH = 0x30a,
+ OPCODE_READ = 0x30b, OPCODE_EAT = 0x30c, OPCODE_PLACE = 0x30d, OPCODE_OPEN = 0x30e, OPCODE_TAKE = 0x30f,
+ OPCODE_LOOK = 0x310, OPCODE_SMELL = 0x311, OPCODE_SOUND = 0x312, OPCODE_LEAVE = 0x313, OPCODE_LIFT = 0x314,
+ OPCODE_TURN = 0x315, OPCODE_SHIDE = 0x401, OPCODE_SSEARCH = 0x402, OPCODE_SREAD = 0x403, OPCODE_SPUT = 0x404,
+ OPCODE_SLOOK = 0x405};
const int max_patt = 20;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-10 13:50:19 +0000