[Scummvm-git-logs] scummvm master -> 47dba1b57f18ee91db6409d5a0b3ac5718b1cace
dreammaster
noreply at scummvm.org
Fri Oct 18 05:44:36 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
47dba1b57f M4: RIDDLE: Set sendWSMessage methods to use action constants
Commit: 47dba1b57f18ee91db6409d5a0b3ac5718b1cace
https://github.com/scummvm/scummvm/commit/47dba1b57f18ee91db6409d5a0b3ac5718b1cace
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-17T22:44:25-07:00
Commit Message:
M4: RIDDLE: Set sendWSMessage methods to use action constants
Changed paths:
engines/m4/riddle/triggers.cpp
engines/m4/wscript/ws_machine.h
diff --git a/engines/m4/riddle/triggers.cpp b/engines/m4/riddle/triggers.cpp
index 7a5866af1ed..e6405d39c6e 100644
--- a/engines/m4/riddle/triggers.cpp
+++ b/engines/m4/riddle/triggers.cpp
@@ -69,6 +69,27 @@ void setGlobals4(int series, int val2, int val3, int val4) {
_G(globals)[GLB_TEMP_4] = val4;
}
+machine *triggerMachineByHash_3000(int myHash, int dataHash, int normalDir, int shadowDir,
+ int param1, int param2, int index, MessageCB intrMsg, const char *machName) {
+ static const byte NUMS[14] = { 0, 0, 1, 2, 3, 4, 4, 5, 6, 7, 8, 9, 9, 0 };
+
+ _G(globals)[GLB_TEMP_1] = dataHash << 16;
+ _G(globals)[GLB_TEMP_2] = normalDir << 24;
+ _G(globals)[GLB_TEMP_3] = shadowDir << 24;
+ _G(globals)[GLB_TEMP_4] = param1 << 16;
+ _G(globals)[GLB_TEMP_5] = param2 << 16;
+ _G(globals)[GLB_TEMP_6] = MulSF16((param2 << 16) - _G(globals)[V002],
+ _G(globals)[V006]) + _G(globals)[V004];
+ _G(globals)[GLB_TEMP_7] = NUMS[index] << 16;
+
+ machine *result = TriggerMachineByHash(myHash, nullptr, dataHash + 8, 0,
+ intrMsg ? intrMsg : &triggerMachineByHashCallback3000,
+ false, machName);
+ _G(inverse_pal)->release();
+
+ return result;
+}
+
void sendWSMessage_10000(int val1, machine *mach, int val2, int val3,
int val4, int trigger, int val9, int val6, int val7, int val8) {
if (!trigger)
@@ -84,7 +105,7 @@ void sendWSMessage_10000(int val1, machine *mach, int val2, int val3,
_G(globals)[GLB_TEMP_8] = val8 << 16;
_G(globals)[GLB_TEMP_9] = val9 << 24;
- sendWSMessage(0x10000, 0, mach, 0, nullptr, 1);
+ sendWSMessage(STARTWALK << 16, 0, mach, 0, nullptr, 1);
}
void sendWSMessage_10000(machine *mach, int destX, int destY, int index, int trigger, int val4) {
@@ -98,40 +119,23 @@ void sendWSMessage_10000(machine *mach, int destX, int destY, int index, int tri
_G(globals)[GLB_TEMP_5] = kernel_trigger_create(trigger);
_G(globals)[GLB_TEMP_6] = val4 << 16;
- sendWSMessage(0x10000, 0, mach, 0, nullptr, 1);
-}
-
-machine *triggerMachineByHash_3000(int myHash, int dataHash, int normalDir, int shadowDir,
- int param1, int param2, int index, MessageCB intrMsg, const char *machName) {
- static const byte NUMS[14] = { 0, 0, 1, 2, 3, 4, 4, 5, 6, 7, 8, 9, 9, 0 };
-
- _G(globals)[GLB_TEMP_1] = dataHash << 16;
- _G(globals)[GLB_TEMP_2] = normalDir << 24;
- _G(globals)[GLB_TEMP_3] = shadowDir << 24;
- _G(globals)[GLB_TEMP_4] = param1 << 16;
- _G(globals)[GLB_TEMP_5] = param2 << 16;
- _G(globals)[GLB_TEMP_6] = MulSF16((param2 << 16) - _G(globals)[V002],
- _G(globals)[V006]) + _G(globals)[V004];
- _G(globals)[GLB_TEMP_7] = NUMS[index] << 16;
-
- machine *result = TriggerMachineByHash(myHash, nullptr, dataHash + 8, 0,
- intrMsg ? intrMsg : &triggerMachineByHashCallback3000,
- false, machName);
- _G(inverse_pal)->release();
-
- return result;
+ sendWSMessage(STARTWALK << 16, 0, mach, 0, nullptr, 1);
}
void sendWSMessage_60000(machine *mach) {
- sendWSMessage(0x60000, 0, mach, 0, nullptr, 1);
+ sendWSMessage(TERMINATE << 16, 0, mach, 0, nullptr, 1);
}
void sendWSMessage_80000(machine *mach) {
- sendWSMessage(0x80000, 0, mach, 0, nullptr, 1);
+ sendWSMessage(PLAYER_UNHIDE << 16, 0, mach, 0, nullptr, 1);
}
void sendWSMessage_B0000(machine *mach, int trigger) {
+ if (!trigger)
+ trigger = -1;
+ _G(globals)[GLB_TEMP_5] = kernel_trigger_create(trigger);
+ sendWSMessage(ACTION_11 << 16, 0, mach, 0, nullptr, 1);
}
void sendWSMessage_B0000(int trigger) {
@@ -143,7 +147,7 @@ void sendWSMessage_C0000(machine *mach, int trigger) {
trigger = -1;
_G(globals)[GLB_TEMP_5] = kernel_trigger_create(trigger);
- sendWSMessage(0xC0000, 0, mach, 0, nullptr, 1);
+ sendWSMessage(ACTION_12 << 16, 0, mach, 0, nullptr, 1);
}
void sendWSMessage_C0000(int trigger) {
@@ -151,7 +155,7 @@ void sendWSMessage_C0000(int trigger) {
}
void sendWSMessage_D0000(machine *mach) {
- sendWSMessage(0xd0000, 0, mach, 0, nullptr, 1);
+ sendWSMessage(ACTION_13 << 16, 0, mach, 0, nullptr, 1);
}
void sendWSMessage_D0000() {
@@ -159,7 +163,7 @@ void sendWSMessage_D0000() {
}
void sendWSMessage_E0000(machine *mach) {
- sendWSMessage(0xe0000, 0, mach, 0, nullptr, 1);
+ sendWSMessage(ACTION_14 << 16, 0, mach, 0, nullptr, 1);
}
void sendWSMessage_E0000() {
@@ -171,7 +175,7 @@ void sendWSMessage_F0000(machine *mach, int trigger) {
trigger = -1;
_G(globals)[GLB_TEMP_4] = kernel_trigger_create(trigger);
- sendWSMessage(0xf0000, 0, mach, 0, nullptr, 1);
+ sendWSMessage(ACTION_15 << 16, 0, mach, 0, nullptr, 1);
}
void sendWSMessage_F0000(int trigger) {
@@ -183,7 +187,7 @@ void sendWSMessage_110000(machine *mach, int trigger) {
trigger = -1;
_G(globals)[V023] = kernel_trigger_create(trigger);
- sendWSMessage(0x110000, 0, mach, 0, nullptr, 1);
+ sendWSMessage(ACTION_17 << 16, 0, mach, 0, nullptr, 1);
}
void sendWSMessage_110000(int trigger) {
@@ -195,7 +199,7 @@ void sendWSMessage_120000(machine *mach, int trigger) {
trigger = -1;
_G(globals)[V023] = kernel_trigger_create(trigger);
- sendWSMessage(0x120000, 0, mach, 0, nullptr, 1);
+ sendWSMessage(ACTION_18 << 16, 0, mach, 0, nullptr, 1);
}
void sendWSMessage_120000(int trigger) {
@@ -207,7 +211,7 @@ void sendWSMessage_130000(machine *recv, int val1) {
val1 = -1;
_G(globals)[V023] = kernel_trigger_create(val1);
- sendWSMessage(0x130000, 0, recv, 0, 0, 1);
+ sendWSMessage(ACTION_19 << 16, 0, recv, 0, 0, 1);
}
void sendWSMessage_130000(int val1) {
@@ -219,7 +223,7 @@ void sendWSMessage_140000(machine *mach, int trigger) {
trigger = -1;
_G(globals)[V023] = kernel_trigger_create(trigger);
- sendWSMessage(0x140000, 0, mach, 0, nullptr, 1);
+ sendWSMessage(ACTION_20 << 16, 0, mach, 0, nullptr, 1);
}
void sendWSMessage_140000(int trigger) {
@@ -228,7 +232,7 @@ void sendWSMessage_140000(int trigger) {
void sendWSMessage_150000(machine *mach, int trigger) {
_G(globals)[V023] = kernel_trigger_create(trigger);
- sendWSMessage(0x150000, 0, mach, 0, nullptr, 1);
+ sendWSMessage(ACTION_21 << 16, 0, mach, 0, nullptr, 1);
}
void sendWSMessage_150000(int trigger) {
@@ -241,7 +245,7 @@ void sendWSMessage_160000(machine *mach, int val1, int trigger) {
_G(globals)[V023] = kernel_trigger_create(trigger);
_G(globals)[V024] = val1 << 16;
- sendWSMessage(0x160000, 0, mach, 0, nullptr, 1);
+ sendWSMessage(ACTION_22 << 16, 0, mach, 0, nullptr, 1);
}
void sendWSMessage_160000(int val1, int trigger) {
@@ -253,7 +257,7 @@ void sendWSMessage_180000(machine *recv, int trigger) {
trigger = -1;
_G(globals)[V023] = kernel_trigger_create(trigger);
- sendWSMessage(0x180000, 0, recv, 0, nullptr, 1);
+ sendWSMessage(ACTION_24 << 16, 0, recv, 0, nullptr, 1);
}
void sendWSMessage_180000(int trigger) {
@@ -262,7 +266,7 @@ void sendWSMessage_180000(int trigger) {
void sendWSMessage_190000(machine *recv, int trigger) {
_G(globals)[V023] = trigger << 16;
- sendWSMessage(0x190000, 0, recv, 0, nullptr, 1);
+ sendWSMessage(ACTION_25 << 16, 0, recv, 0, nullptr, 1);
}
void sendWSMessage_190000(int trigger) {
@@ -271,13 +275,13 @@ void sendWSMessage_190000(int trigger) {
void sendWSMessage_1a0000(machine *recv, int trigger) {
_G(globals)[V024] = trigger << 16;
- sendWSMessage(0x1a0000, 0, recv, 0, nullptr, 1);
+ sendWSMessage(ACTION_26 << 16, 0, recv, 0, nullptr, 1);
}
void sendWSMessage_1e0000(machine *recv, int val1, int val2) {
_G(globals)[V023] = val1 << 16;
_G(globals)[V024] = val2 << 16;
- sendWSMessage(0x1e0000, 0, recv, 0, nullptr, 1);
+ sendWSMessage(ACTION_30 << 16, 0, recv, 0, nullptr, 1);
}
void sendWSMessage_1e0000(int val1, int val2) {
@@ -287,7 +291,7 @@ void sendWSMessage_1e0000(int val1, int val2) {
void sendWSMessage_1f0000(machine *recv, int val1, int val2) {
_G(globals)[V023] = val1 << 16;
_G(globals)[V024] = val2 << 16;
- sendWSMessage(0x1f0000, 0, recv, 0, nullptr, 1);
+ sendWSMessage(ACTION_31 << 16, 0, recv, 0, nullptr, 1);
}
void sendWSMessage_1f0000(int val1, int val2) {
@@ -296,17 +300,17 @@ void sendWSMessage_1f0000(int val1, int val2) {
void sendWSMessage_200000(machine *recv, int trigger) {
_G(globals)[V023] = (trigger << 16) / 100;
- sendWSMessage(0x200000, 0, recv, 0, nullptr, 1);
+ sendWSMessage(ACTION_32 << 16, 0, recv, 0, nullptr, 1);
}
void sendWSMessage_210000(machine *recv, int trigger) {
_G(globals)[V023] = (trigger << 16) / 100;
- sendWSMessage(0x210000, 0, recv, 0, nullptr, 1);
+ sendWSMessage(ACTION_33 << 16, 0, recv, 0, nullptr, 1);
}
void sendWSMessage_29a0000(machine *recv, int val1) {
_G(globals)[GLB_TEMP_1] = val1 << 24;
- sendWSMessage(0x29a0000, 0, recv, 0, 0, 1);
+ sendWSMessage(ACTION_666 << 16, 0, recv, 0, 0, 1);
}
void sendWSMessage_29a0000(int val1) {
diff --git a/engines/m4/wscript/ws_machine.h b/engines/m4/wscript/ws_machine.h
index daad9288d1b..985a034cdc0 100644
--- a/engines/m4/wscript/ws_machine.h
+++ b/engines/m4/wscript/ws_machine.h
@@ -41,7 +41,30 @@ enum {
TERMINATE = 6,
PLAYER_HIDE = 7,
PLAYER_UNHIDE = 8,
- TURN_TO_FACE = 9
+ TURN_TO_FACE = 9,
+ ACTION_11 = 11,
+ ACTION_12 = 12,
+ ACTION_13 = 13,
+ ACTION_14 = 14,
+ ACTION_15 = 15,
+ ACTION_17 = 17,
+ ACTION_18 = 18,
+ ACTION_19 = 19,
+ ACTION_20 = 20,
+ ACTION_21 = 21,
+ ACTION_22 = 22,
+ ACTION_23 = 23,
+ ACTION_24 = 24,
+ ACTION_25 = 25,
+ ACTION_26 = 26,
+ ACTION_27 = 27,
+ ACTION_28 = 28,
+ ACTION_29 = 29,
+ ACTION_30 = 30,
+ ACTION_31 = 31,
+ ACTION_32 = 32,
+ ACTION_33 = 33,
+ ACTION_666 = 666
};
// A message request
More information about the Scummvm-git-logs
mailing list