[Scummvm-git-logs] scummvm master -> 599fbc290a25ef671f844cada1705219c735042b

[sluicebox]

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:
599fbc290a WATCHMAKER: Fix MSVC build


Commit: 599fbc290a25ef671f844cada1705219c735042b
    https://github.com/scummvm/scummvm/commit/599fbc290a25ef671f844cada1705219c735042b
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2025-04-18T00:30:20-07:00

Commit Message:
WATCHMAKER: Fix MSVC build

Changed paths:
    engines/watchmaker/3d/math/Matrix4x4.cpp
    engines/watchmaker/init/nl_init.cpp
    engines/watchmaker/init/nl_parse.cpp
    engines/watchmaker/init/nl_parse.h


diff --git a/engines/watchmaker/3d/math/Matrix4x4.cpp b/engines/watchmaker/3d/math/Matrix4x4.cpp
index b295e5882de..6b6a0ad351b 100644
--- a/engines/watchmaker/3d/math/Matrix4x4.cpp
+++ b/engines/watchmaker/3d/math/Matrix4x4.cpp
@@ -23,4 +23,4 @@
 
 namespace Watchmaker {
 
-} // End of namespace Watchmaker
\ No newline at end of file
+} // End of namespace Watchmaker
diff --git a/engines/watchmaker/init/nl_init.cpp b/engines/watchmaker/init/nl_init.cpp
index 1f1a63b4d9a..87b9cbb87a1 100644
--- a/engines/watchmaker/init/nl_init.cpp
+++ b/engines/watchmaker/init/nl_init.cpp
@@ -67,7 +67,7 @@ typedef struct {
 	unsigned int value;
 } TOKEN;                                // 32 bytes
 
-int SaveTextTable(char *name);
+int SaveTextTable(const char *name);
 
 #define AddSound2Room(inx,val)  \
 	{   \
@@ -1611,8 +1611,9 @@ int StructureInitializer::ParseCredits(char *s) {
 	return TRUE;
 }
 
-int SaveTextTable(char *name) {
+int SaveTextTable(const char *name) {
 	warning("TODO: Implement SaveTextTable(%s)", name);
+	return 0;
 }
 
 
diff --git a/engines/watchmaker/init/nl_parse.cpp b/engines/watchmaker/init/nl_parse.cpp
index 9949d5638bd..9cc94072660 100644
--- a/engines/watchmaker/init/nl_parse.cpp
+++ b/engines/watchmaker/init/nl_parse.cpp
@@ -28,8 +28,8 @@ namespace Watchmaker {
 
 #define JParse_EOF()    (_stream->eos())
 
-int NLParser::MatchWord(char *token) {
-	char *str = token;
+int NLParser::MatchWord(const char *token) {
+	const char *str = token;
 	while (!JParse_EOF() && (*str) != 0) {
 		if (JParse_ReadByte() != *str)
 			str = token;
diff --git a/engines/watchmaker/init/nl_parse.h b/engines/watchmaker/init/nl_parse.h
index 640375ad07b..3b5544e90a9 100644
--- a/engines/watchmaker/init/nl_parse.h
+++ b/engines/watchmaker/init/nl_parse.h
@@ -65,7 +65,7 @@ public:
 		return 1;
 	}
 
-	int MatchWord(char *token);
+	int MatchWord(const char *token);
 
 #define EOF_PARSED    -2
 };