[Scummvm-git-logs] scummvm master -> 443f2ff593c96ad2c72c5c0052321b4708e16e17
AndywinXp
noreply at scummvm.org
Sun Oct 12 19:30:43 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
443f2ff593 SCUMM: HE: Clean up and relabel some SCUMM variable names
Commit: 443f2ff593c96ad2c72c5c0052321b4708e16e17
https://github.com/scummvm/scummvm/commit/443f2ff593c96ad2c72c5c0052321b4708e16e17
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-10-12T21:29:41+02:00
Commit Message:
SCUMM: HE: Clean up and relabel some SCUMM variable names
Changed paths:
engines/scumm/he/intern_he.h
engines/scumm/he/logic_he.cpp
engines/scumm/he/moonbase/moonbase.cpp
engines/scumm/he/resource_he.cpp
engines/scumm/he/script_v72he.cpp
engines/scumm/scumm.cpp
engines/scumm/scumm.h
engines/scumm/vars.cpp
diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index 7ee477837a4..8094e05ed94 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -802,11 +802,11 @@ protected:
byte VAR_NUM_SPRITE_GROUPS;
byte VAR_NUM_SPRITES;
byte VAR_NUM_PALETTES;
- byte VAR_NUM_UNK;
+ byte VAR_NUM_WINDOWS;
byte VAR_SPRITE_IMAGE_CHANGE_DOES_NOT_RESET_SETTINGS;
byte VAR_U32_VERSION;
- byte VAR_U32_ARRAY_UNK;
+ byte VAR_U32_RESERVED;
#ifdef USE_ENET
byte VAR_REMOTE_START_SCRIPT = 98;
diff --git a/engines/scumm/he/logic_he.cpp b/engines/scumm/he/logic_he.cpp
index 0cd2afc316e..60e089fafc2 100644
--- a/engines/scumm/he/logic_he.cpp
+++ b/engines/scumm/he/logic_he.cpp
@@ -41,12 +41,12 @@ int LogicHE::versionID() {
}
int LogicHE::getFromArray(int arg0, int idx2, int idx1) {
- _vm->VAR(_vm->VAR_U32_ARRAY_UNK) = arg0;
+ _vm->VAR(_vm->VAR_U32_RESERVED) = arg0;
return _vm->readArray(116, idx2, idx1);
}
void LogicHE::putInArray(int arg0, int idx2, int idx1, int val) {
- _vm->VAR(_vm->VAR_U32_ARRAY_UNK) = arg0;
+ _vm->VAR(_vm->VAR_U32_RESERVED) = arg0;
_vm->writeArray(116, idx2, idx1, val);
}
diff --git a/engines/scumm/he/moonbase/moonbase.cpp b/engines/scumm/he/moonbase/moonbase.cpp
index 6ed17bcae32..fd0bdb09e4e 100644
--- a/engines/scumm/he/moonbase/moonbase.cpp
+++ b/engines/scumm/he/moonbase/moonbase.cpp
@@ -44,15 +44,15 @@ Moonbase::~Moonbase() {
}
int Moonbase::readFromArray(int array, int y, int x) {
- _vm->VAR(_vm->VAR_U32_ARRAY_UNK) = array;
+ _vm->VAR(_vm->VAR_U32_RESERVED) = array;
- return _vm->readArray(_vm->VAR_U32_ARRAY_UNK, y, x);
+ return _vm->readArray(_vm->VAR_U32_RESERVED, y, x);
}
void Moonbase::deallocateArray(int array) {
- _vm->VAR(_vm->VAR_U32_ARRAY_UNK) = array;
+ _vm->VAR(_vm->VAR_U32_RESERVED) = array;
- return _vm->nukeArray(_vm->VAR_U32_ARRAY_UNK);
+ return _vm->nukeArray(_vm->VAR_U32_RESERVED);
}
int Moonbase::callScummFunction(int scriptNumber, int paramCount,...) {
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index c94331cdb49..1b46594d1cb 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -283,7 +283,7 @@ void ScummEngine_v99he::readMAXS(int blockSize) {
_numLocalScripts = _fileHandle->readUint16LE();
_HEHeapSize = _fileHandle->readUint16LE();
_numPalettes = _fileHandle->readUint16LE();
- _numUnk = _fileHandle->readUint16LE();
+ _numWindows = _fileHandle->readUint16LE();
_numTalkies = _fileHandle->readUint16LE();
_numNewNames = 10;
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index d9f74479f40..a4e437a156d 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -1809,7 +1809,7 @@ void ScummEngine_v72he::getStringFromArray(int arrayNumber, char *buffer, int ma
// this function makes a C-string out of <arrayNumber> contents
- VAR(0) = arrayNumber; // it was 0 in original code, but I've seen ScummVM Moonbase code which uses VAR_U32_ARRAY_UNK
+ VAR(0) = arrayNumber; // it was 0 in original code, but I've seen ScummVM Moonbase code which uses VAR_U32_RESERVED
int i, ch;
for (i = 0; i < maxLength; ++i) {
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index f93b7a57b92..cb33188e265 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -817,11 +817,11 @@ ScummEngine_v90he::ScummEngine_v90he(OSystem *syst, const DetectorResult &dr)
VAR_NUM_SPRITE_GROUPS = 0xFF;
VAR_NUM_SPRITES = 0xFF;
VAR_NUM_PALETTES = 0xFF;
- VAR_NUM_UNK = 0xFF;
+ VAR_NUM_WINDOWS = 0xFF;
VAR_SPRITE_IMAGE_CHANGE_DOES_NOT_RESET_SETTINGS = 0xFF;
VAR_U32_VERSION = 0xFF;
- VAR_U32_ARRAY_UNK = 0xFF;
+ VAR_U32_RESERVED = 0xFF;
}
ScummEngine_v90he::~ScummEngine_v90he() {
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index fd2399e374d..b6388013525 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -851,7 +851,7 @@ protected:
int _numPalettes = 0;
int _numSprites = 0;
int _numTalkies = 0;
- int _numUnk = 0;
+ int _numWindows = 0;
int _HEHeapSize = 0;
public:
@@ -1897,6 +1897,8 @@ public:
byte VAR_LAST_FRAME_BURN_TIME = 0xFF; // HE90+
byte VAR_LAST_FRAME_SCUMM_TIME = 0xFF; // HE90+
+ byte VAR_WINDEX_RUNNING = 0xFF;
+
#ifdef USE_RGB_COLOR
// FM-Towns / PC-Engine specific
Graphics::FontSJIS *_cjkFont = nullptr;
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp
index 029a3c4a7de..a1a47ced8d1 100644
--- a/engines/scumm/vars.cpp
+++ b/engines/scumm/vars.cpp
@@ -317,6 +317,7 @@ void ScummEngine_v80he::setupScummVars() {
VAR_PLATFORM_VERSION = 79;
VAR_CURRENT_CHARSET = 80;
VAR_SOUND_TOKEN_OFFSET = 84;
+ VAR_WINDEX_RUNNING = 85;
VAR_KEY_STATE = 86;
VAR_SOUND_CALLBACK_SCRIPT = 87;
VAR_NUM_SOUND_CHANNELS = 88;
@@ -338,7 +339,7 @@ void ScummEngine_v90he::setupScummVars() {
VAR_NUM_SPRITE_GROUPS = 105;
VAR_NUM_SPRITES = 106;
VAR_U32_VERSION = 107;
- VAR_U32_ARRAY_UNK = 116;
+ VAR_U32_RESERVED = 116;
VAR_WIZ_TRANSPARENT_COLOR = 117;
VAR_OPERATION_FAILURE = 119;
VAR_START_DYN_SOUND_CHANNELS = 120;
@@ -357,7 +358,7 @@ void ScummEngine_v90he::setupScummVars() {
#endif
VAR_MAIN_SCRIPT = 127;
VAR_NUM_PALETTES = 130;
- VAR_NUM_UNK = 131;
+ VAR_NUM_WINDOWS = 131;
VAR_SPRITE_IMAGE_CHANGE_DOES_NOT_RESET_SETTINGS = 139;
}
}
@@ -741,7 +742,7 @@ void ScummEngine_v90he::resetScummVars() {
}
if (_game.heversion >= 98) {
VAR(VAR_U32_VERSION) = _logicHE->versionID();
- VAR(VAR_U32_ARRAY_UNK) = 0;
+ VAR(VAR_U32_RESERVED) = 0;
}
}
@@ -749,7 +750,7 @@ void ScummEngine_v99he::resetScummVars() {
ScummEngine_v90he::resetScummVars();
VAR(VAR_NUM_PALETTES) = _numPalettes;
- VAR(VAR_NUM_UNK) = _numUnk;
+ VAR(VAR_NUM_WINDOWS) = _numWindows;
if (_game.heversion >= 100 && (_game.features & GF_16BIT_COLOR)) {
// Enable Bink video in 16bit color games
@@ -819,8 +820,8 @@ void ScummEngine::resetScummVars() {
if (VAR_DEBUGMODE != 0xFF) {
VAR(VAR_DEBUGMODE) = (_debugMode ? 1 : 0);
- if (_game.heversion >= 80 && _debugMode)
- VAR(85) = 1;
+ if (_game.heversion >= 80 && _debugMode && VAR_WINDEX_RUNNING != 0xFF)
+ VAR(VAR_WINDEX_RUNNING) = 1;
}
if (VAR_FADE_DELAY != 0xFF)
More information about the Scummvm-git-logs
mailing list