[Scummvm-git-logs] scummvm master -> 649b9fda06250fad9ef3c18be55c499346f37674

[Strangerke]

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:
649b9fda06 M4: Finish reviewing wscript


Commit: 649b9fda06250fad9ef3c18be55c499346f37674
    https://github.com/scummvm/scummvm/commit/649b9fda06250fad9ef3c18be55c499346f37674
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-15T21:51:55+01:00

Commit Message:
M4: Finish reviewing wscript

Changed paths:
  R engines/m4/wscript/ws_univ.h
  R engines/m4/wscript/wscript.cpp
    engines/m4/module.mk
    engines/m4/wscript/ws_timer.cpp
    engines/m4/wscript/wst_regs.cpp
    engines/m4/wscript/wst_regs.h


diff --git a/engines/m4/module.mk b/engines/m4/module.mk
index c7ec28cf33f..a352e59cbf5 100644
--- a/engines/m4/module.mk
+++ b/engines/m4/module.mk
@@ -76,7 +76,6 @@ MODULE_OBJS = \
 	wscript/ws_load.o \
 	wscript/ws_machine.o \
 	wscript/ws_timer.o \
-	wscript/wscript.o \
 	wscript/wst_regs.o \
 	burger/core/conv.o \
 	burger/core/play_break.o \
diff --git a/engines/m4/wscript/ws_timer.cpp b/engines/m4/wscript/ws_timer.cpp
index 9a554c88a35..93c7f6ed2ef 100644
--- a/engines/m4/wscript/ws_timer.cpp
+++ b/engines/m4/wscript/ws_timer.cpp
@@ -118,8 +118,8 @@ void ws_CheckTimeReqs(int32 curTime) {
 	while (tempTimeReq && (tempTimeReq->myTime <= curTime)) {
 		// Extract all important information from request
 		machine *myXM = tempTimeReq->myXM;
-		int32 pcOffset = tempTimeReq->pcOffset;
-		int32 pcCount = tempTimeReq->pcCount;
+		const int32 pcOffset = tempTimeReq->pcOffset;
+		const int32 pcCount = tempTimeReq->pcCount;
 
 		// Remove it from the list and dispose
 		_GWS(firstTimeReq) = _GWS(firstTimeReq)->next;
diff --git a/engines/m4/wscript/ws_univ.h b/engines/m4/wscript/ws_univ.h
deleted file mode 100644
index 183337cfe0a..00000000000
--- a/engines/m4/wscript/ws_univ.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef M4_WSCRIPT_WS_UNIV_H
-#define M4_WSCRIPT_WS_UNIV_H
-
-#include "m4/m4_types.h"
-
-namespace M4 {
-
-
-} // End of namespace M4
-
-#endif
diff --git a/engines/m4/wscript/wscript.cpp b/engines/m4/wscript/wscript.cpp
deleted file mode 100644
index 1ef8b96a785..00000000000
--- a/engines/m4/wscript/wscript.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "m4/wscript/wscript.h"
-
-namespace M4 {
-
-} // End of namespace M4
diff --git a/engines/m4/wscript/wst_regs.cpp b/engines/m4/wscript/wst_regs.cpp
index 4a0b734e624..c37a2291c4b 100644
--- a/engines/m4/wscript/wst_regs.cpp
+++ b/engines/m4/wscript/wst_regs.cpp
@@ -66,57 +66,4 @@ const char *myRegLabels[IDX_COUNT] = {
 	"mach_id"							//32
 };
 
-const char *myGlobLabels[GLOB_COUNT] = {
-	"***SYSTEM - TIME",
-	"***SYSTEM - WATCHDOG",
-	"min_y",
-	"max_y",
-	"min_scale",
-	"max_scale",
-	"scaler",
-	"g_temp1",
-	"g_temp2",
-	"g_temp3",
-	"g_temp4",
-	"g_temp5",
-	"g_temp6",
-	"g_temp7",
-	"g_temp8",
-	"g_temp9",
-	"g_temp10",
-	"g_temp11",
-	"g_temp12",
-	"g_temp13",
-	"g_temp14",
-	"g_temp15",
-	"g_temp16",
-	"g_temp17",
-	"g_temp18",
-	"g_temp19",
-	"g_temp20",
-	"g_temp21",
-	"g_temp22",
-	"g_temp23",
-	"g_temp24",
-	"g_temp25",
-	"g_temp26",
-	"g_temp27",
-	"g_temp28",
-	"g_temp29",
-	"g_temp30",
-	"g_temp31",
-	"g_temp32",
-};
-
-const char *tagLabels[TAG_COUNT] = {
-	"tag_none",
-	"tag_targs",
-	"tag_bez",
-	"tag_deltas",
-	"tag_vectors",
-	"tag_text",
-	"tag_move_cel",
-	"tag_map_cel"
-};
-
 } // End of namespace M4
diff --git a/engines/m4/wscript/wst_regs.h b/engines/m4/wscript/wst_regs.h
index f20171a7dd6..59f36719eb6 100644
--- a/engines/m4/wscript/wst_regs.h
+++ b/engines/m4/wscript/wst_regs.h
@@ -83,11 +83,7 @@ enum {
 #define TAG_MOVE_CEL		0x00004000
 #define TAG_MAP_CEL			0x00002000
 
-#define GLOB_COUNT 39
-
 extern const char *myRegLabels[];
-extern const char *myGlobLabels[];
-extern const char *tagLabels[];
 
 } // End of namespace M4