aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scumm/camera.cpp6
-rw-r--r--scumm/debugger.cpp4
-rw-r--r--scumm/object.cpp4
-rw-r--r--scumm/script.cpp8
-rw-r--r--scumm/script_v2.cpp7
-rw-r--r--scumm/script_v5.cpp6
-rw-r--r--scumm/script_v6.cpp6
-rw-r--r--scumm/scumm.h4
-rw-r--r--scumm/scummvm.cpp2
-rw-r--r--scumm/vars.cpp6
10 files changed, 26 insertions, 27 deletions
diff --git a/scumm/camera.cpp b/scumm/camera.cpp
index 6a51c0dfec..f906aef20e 100644
--- a/scumm/camera.cpp
+++ b/scumm/camera.cpp
@@ -106,7 +106,7 @@ void Scumm::setCameraFollows(Actor *a) {
if (_actors[i].isInCurrentRoom())
_actors[i].needRedraw = true;
}
- runHook(0);
+ runInventoryScript(0);
}
void Scumm_v7::setCameraFollows(Actor *a) {
@@ -129,7 +129,7 @@ void Scumm_v7::setCameraFollows(Actor *a) {
}
if (a->number != oldfollow)
- runHook(0);
+ runInventoryScript(0);
}
@@ -365,7 +365,7 @@ void Scumm::actorFollowCamera(int act) {
old = camera._follows;
setCameraFollows(derefActor(act, "actorFollowCamera"));
if (camera._follows != old)
- runHook(0);
+ runInventoryScript(0);
camera._movingToActor = false;
}
diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp
index 5918bc2aa5..3d4b4da8d2 100644
--- a/scumm/debugger.cpp
+++ b/scumm/debugger.cpp
@@ -620,7 +620,7 @@ bool ScummDebugger::Cmd_Object(int argc, const char **argv) {
for (i = 1; i < _s->_maxInventoryItems; i++) {
if (_s->_inventory[i] == (uint16)obj) {
_s->putOwner(obj, _s->VAR(_s->VAR_EGO));
- _s->runHook(obj);
+ _s->runInventoryScript(obj);
return true;
}
}
@@ -635,7 +635,7 @@ bool ScummDebugger::Cmd_Object(int argc, const char **argv) {
_s->putState(obj, 1);
_s->removeObjectFromRoom(obj);
_s->clearDrawObjectQueue();
- _s->runHook(obj);
+ _s->runInventoryScript(obj);
} else {
Debug_Printf("Unknown object command '%s'\nRight now the only command is pickup", argv[2]); //change when adding commands
}
diff --git a/scumm/object.cpp b/scumm/object.cpp
index 4bbdf05769..8b10881c22 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -1171,7 +1171,7 @@ void Scumm::setOwnerOf(int obj, int owner) {
ss = &vm.slot[_currentScript];
if (ss->where == WIO_INVENTORY && _inventory[ss->number] == obj) {
putOwner(obj, 0);
- runHook(0);
+ runInventoryScript(0);
stopObjectCode();
return;
}
@@ -1180,7 +1180,7 @@ void Scumm::setOwnerOf(int obj, int owner) {
SamInventoryHack(obj);
putOwner(obj, owner);
- runHook(0);
+ runInventoryScript(0);
}
int Scumm::getObjX(int obj) {
diff --git a/scumm/script.cpp b/scumm/script.cpp
index 9a9ffd72a4..0d12dbe129 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -647,14 +647,14 @@ void Scumm::stopObjectCode() {
_currentScript = 0xFF;
}
-void Scumm::runHook(int i) {
+void Scumm::runInventoryScript(int i) {
if (_version <= 2) {
- // FIXME - TODO
+ redrawV2Inventory();
} else {
int tmp[16];
tmp[0] = i;
- if (VAR(VAR_HOOK_SCRIPT)) {
- runScript(VAR(VAR_HOOK_SCRIPT), 0, 0, tmp);
+ if (VAR(VAR_INVENTORY_SCRIPT)) {
+ runScript(VAR(VAR_INVENTORY_SCRIPT), 0, 0, tmp);
}
}
}
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 5b37c7fb59..396156d75f 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -1153,7 +1153,6 @@ void Scumm_v2::o2_setOwnerOf() {
owner = getVarOrDirectByte(0x40);
setOwnerOf(obj, owner);
- redrawV2Inventory();
}
void Scumm_v2::o2_delay() {
@@ -1296,7 +1295,7 @@ void Scumm_v2::o2_pickupObject() {
putState(obj, getState(obj) | 0xA);
clearDrawObjectQueue();
- redrawV2Inventory();
+ runInventoryScript(1);
}
void Scumm_v2::o2_setObjectName() {
@@ -1344,7 +1343,7 @@ void Scumm_v2::o2_setObjectName() {
work[i-1] = 0;
memcpy(name, work, i);
- redrawV2Inventory();
+ runInventoryScript(0);
}
void Scumm_v2::o2_cursorCommand() { // TODO: Define the magic numbers
@@ -1357,7 +1356,7 @@ void Scumm_v2::o2_cursorCommand() { // TODO: Define the magic numbers
if (a2 & 4) { // Userface
_userState = a2 & (32 | 64 | 128);
- redrawV2Inventory();
+ runInventoryScript(0);
}
if (a2 & 1) { // Freeze
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 76136442f0..6e1c0775f6 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -1415,7 +1415,7 @@ void Scumm_v5::o5_pickupObject() {
putState(obj, 1);
removeObjectFromRoom(obj);
clearDrawObjectQueue();
- runHook(1);
+ runInventoryScript(1);
}
void Scumm_v5::o5_print() {
@@ -1984,7 +1984,7 @@ void Scumm_v5::o5_setObjectName() {
}
memcpy(name, work, i+1);
- runHook(0);
+ runInventoryScript(0);
}
void Scumm_v5::o5_setOwnerOf() {
@@ -2681,5 +2681,5 @@ void Scumm_v5::o5_pickupObjectOld() {
putClass(obj, kObjectClassUntouchable, 1);
putState(obj, 1);
clearDrawObjectQueue();
- runHook(1);
+ runInventoryScript(1);
}
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index e5182b1ede..cd42be1659 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -1121,7 +1121,7 @@ void Scumm_v6::o6_pickupObject() {
for (i = 1; i < _maxInventoryItems; i++) {
if (_inventory[i] == (uint16)obj) {
putOwner(obj, VAR(VAR_EGO));
- runHook(obj);
+ runInventoryScript(obj);
return;
}
}
@@ -1132,7 +1132,7 @@ void Scumm_v6::o6_pickupObject() {
putState(obj, 1);
removeObjectFromRoom(obj);
clearDrawObjectQueue();
- runHook(obj); /* Difference */
+ runInventoryScript(obj); /* Difference */
}
void Scumm_v6::o6_loadRoomWithEgo() {
@@ -1336,7 +1336,7 @@ void Scumm_v6::o6_setObjectName() {
if (_newNames[i] == 0) {
loadPtrToResource(rtObjectName, i, NULL);
_newNames[i] = obj;
- runHook(0);
+ runInventoryScript(0);
return;
}
}
diff --git a/scumm/scumm.h b/scumm/scumm.h
index fcbf0a3db9..7f30aeaf90 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -524,7 +524,7 @@ protected:
void runScriptNested(int script);
void executeScript();
void updateScriptPtr();
- void runHook(int i);
+ void runInventoryScript(int i);
void checkAndRunSentenceScript();
void runExitScript();
void runEntryScript();
@@ -1123,7 +1123,7 @@ public:
byte VAR_EXIT_SCRIPT2;
byte VAR_VERB_SCRIPT;
byte VAR_SENTENCE_SCRIPT;
- byte VAR_HOOK_SCRIPT;
+ byte VAR_INVENTORY_SCRIPT;
byte VAR_CUTSCENE_START_SCRIPT;
byte VAR_CUTSCENE_END_SCRIPT;
byte VAR_CHARINC;
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index c95a32103b..193218cc97 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -452,7 +452,7 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst)
VAR_EXIT_SCRIPT2 = 0xFF;
VAR_VERB_SCRIPT = 0xFF;
VAR_SENTENCE_SCRIPT = 0xFF;
- VAR_HOOK_SCRIPT = 0xFF;
+ VAR_INVENTORY_SCRIPT = 0xFF;
VAR_CUTSCENE_START_SCRIPT = 0xFF;
VAR_CUTSCENE_END_SCRIPT = 0xFF;
VAR_CHARINC = 0xFF;
diff --git a/scumm/vars.cpp b/scumm/vars.cpp
index 1aeedad179..59c5381dbf 100644
--- a/scumm/vars.cpp
+++ b/scumm/vars.cpp
@@ -60,7 +60,7 @@ void Scumm::setupScummVars() {
VAR_EXIT_SCRIPT2 = 31;
VAR_VERB_SCRIPT = 32;
VAR_SENTENCE_SCRIPT = 33;
- VAR_HOOK_SCRIPT = 34;
+ VAR_INVENTORY_SCRIPT = 34;
VAR_CUTSCENE_START_SCRIPT = 35;
VAR_CUTSCENE_END_SCRIPT = 36;
VAR_CHARINC = 37;
@@ -194,7 +194,7 @@ void Scumm_v7::setupScummVars() {
VAR_EXIT_SCRIPT2 = 54;
VAR_VERB_SCRIPT = 55;
VAR_SENTENCE_SCRIPT = 56;
- VAR_HOOK_SCRIPT = 57;
+ VAR_INVENTORY_SCRIPT = 57;
VAR_CUTSCENE_START_SCRIPT = 58;
VAR_CUTSCENE_END_SCRIPT = 59;
VAR_SAVELOAD_SCRIPT = 60;
@@ -285,7 +285,7 @@ void Scumm_v8::setupScummVars() {
VAR_EXIT_SCRIPT2 = 54;
VAR_VERB_SCRIPT = 55;
VAR_SENTENCE_SCRIPT = 56;
- VAR_HOOK_SCRIPT = 57;
+ VAR_INVENTORY_SCRIPT = 57;
VAR_CUTSCENE_START_SCRIPT = 58;
VAR_CUTSCENE_END_SCRIPT = 59;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 09:37:02 +0000