[Scummvm-git-logs] scummvm master -> 9528ac4883ab921e05656a2f017c85fc3bdd2658

digitall noreply at scummvm.org
Mon Mar 7 09:17:54 UTC 2022 

This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d09e10a4a1 DEVTOOLS: Fix Redundant Declaration in Ultima Datafile Tool
5705489d5a DEVTOOLS: Fix Redundant Declaration in Cryomni3d Datafile Tool
f0822b2d66 DEVTOOLS: Fix Redundant Declaration in Kyra Datafile Tool
6f637ada20 DEVTOOLS: Fix Redundant Declaration in Neverhood Datafile Tool
0b417714ca DEVTOOLS: Fix Redundant Declaration in Teenagent Datafile Tool
9528ac4883 DEVTOOLS: Fix Redundant Declarations in Titanic Datafile Tool


Commit: d09e10a4a1f240b865851f878dc266e51371b56f
    https://github.com/scummvm/scummvm/commit/d09e10a4a1f240b865851f878dc266e51371b56f
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-07T09:15:04Z

Commit Message:
DEVTOOLS: Fix Redundant Declaration in Ultima Datafile Tool

This would produce GCC Warnings if -Wredundant-decls is enabled.

Changed paths:
    devtools/create_ultima/file.h


diff --git a/devtools/create_ultima/file.h b/devtools/create_ultima/file.h
index aff68eb233f..13fbbbeed63 100644
--- a/devtools/create_ultima/file.h
+++ b/devtools/create_ultima/file.h
@@ -32,7 +32,7 @@
 typedef unsigned char byte;
 typedef unsigned int uint32;
 
-extern void error(const char *s);
+#include "create_ultima.h"
 
 class File {
 private:


Commit: 5705489d5a5667887cb8c89fcc2fb2d2735f5a4f
    https://github.com/scummvm/scummvm/commit/5705489d5a5667887cb8c89fcc2fb2d2735f5a4f
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-07T09:15:04Z

Commit Message:
DEVTOOLS: Fix Redundant Declaration in Cryomni3d Datafile Tool

This would produce GCC Warnings if -Wredundant-decls is enabled.

Changed paths:
    devtools/create_cryomni3d/util.h


diff --git a/devtools/create_cryomni3d/util.h b/devtools/create_cryomni3d/util.h
index 0b406dd4b80..4be66a23a9d 100644
--- a/devtools/create_cryomni3d/util.h
+++ b/devtools/create_cryomni3d/util.h
@@ -69,7 +69,6 @@ size_t writeArray(FILE *fp, T const *array, U elems) {
 void NORETURN_PRE error(const char *s, ...) NORETURN_POST;
 void warning(const char *s, ...);
 void debug(int level, const char *s, ...);
-int scumm_stricmp(const char *s1, const char *s2);
 
 using namespace Common;
 


Commit: f0822b2d66df7522a586ce3de933e31b7c5d04de
    https://github.com/scummvm/scummvm/commit/f0822b2d66df7522a586ce3de933e31b7c5d04de
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-07T09:15:04Z

Commit Message:
DEVTOOLS: Fix Redundant Declaration in Kyra Datafile Tool

This would produce GCC Warnings if -Wredundant-decls is enabled.

Changed paths:
    devtools/create_kyradat/util.h


diff --git a/devtools/create_kyradat/util.h b/devtools/create_kyradat/util.h
index 63f2deedb7c..8550dbdb936 100644
--- a/devtools/create_kyradat/util.h
+++ b/devtools/create_kyradat/util.h
@@ -49,7 +49,6 @@ uint32 fileSize(FILE *fp);
 void NORETURN_PRE error(const char *s, ...) NORETURN_POST;
 void warning(const char *s, ...);
 void debug(int level, const char *s, ...);
-int scumm_stricmp(const char *s1, const char *s2);
 
 using namespace Common;
 


Commit: 6f637ada20dde717878be57e33c571854d88f0e0
    https://github.com/scummvm/scummvm/commit/6f637ada20dde717878be57e33c571854d88f0e0
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-07T09:15:04Z

Commit Message:
DEVTOOLS: Fix Redundant Declaration in Neverhood Datafile Tool

This would produce GCC Warnings if -Wredundant-decls is enabled.

Changed paths:
    devtools/create_neverhood/util.h


diff --git a/devtools/create_neverhood/util.h b/devtools/create_neverhood/util.h
index 63f2deedb7c..8550dbdb936 100644
--- a/devtools/create_neverhood/util.h
+++ b/devtools/create_neverhood/util.h
@@ -49,7 +49,6 @@ uint32 fileSize(FILE *fp);
 void NORETURN_PRE error(const char *s, ...) NORETURN_POST;
 void warning(const char *s, ...);
 void debug(int level, const char *s, ...);
-int scumm_stricmp(const char *s1, const char *s2);
 
 using namespace Common;
 


Commit: 0b417714ca2450758ce4a287eeec9b7e06eb28c2
    https://github.com/scummvm/scummvm/commit/0b417714ca2450758ce4a287eeec9b7e06eb28c2
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-07T09:15:04Z

Commit Message:
DEVTOOLS: Fix Redundant Declaration in Teenagent Datafile Tool

This would produce GCC Warnings if -Wredundant-decls is enabled.

Changed paths:
    devtools/create_teenagent/util.h


diff --git a/devtools/create_teenagent/util.h b/devtools/create_teenagent/util.h
index 63f2deedb7c..8550dbdb936 100644
--- a/devtools/create_teenagent/util.h
+++ b/devtools/create_teenagent/util.h
@@ -49,7 +49,6 @@ uint32 fileSize(FILE *fp);
 void NORETURN_PRE error(const char *s, ...) NORETURN_POST;
 void warning(const char *s, ...);
 void debug(int level, const char *s, ...);
-int scumm_stricmp(const char *s1, const char *s2);
 
 using namespace Common;
 


Commit: 9528ac4883ab921e05656a2f017c85fc3bdd2658
    https://github.com/scummvm/scummvm/commit/9528ac4883ab921e05656a2f017c85fc3bdd2658
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-07T09:15:04Z

Commit Message:
DEVTOOLS: Fix Redundant Declarations in Titanic Datafile Tool

These would produce GCC Warnings if -Wredundant-decls is enabled.

Changed paths:
    devtools/create_titanic/script_preresponses.cpp
    devtools/create_titanic/script_preresponses.h
    devtools/create_titanic/script_quotes.cpp
    devtools/create_titanic/script_quotes.h
    devtools/create_titanic/script_ranges.cpp
    devtools/create_titanic/script_ranges.h
    devtools/create_titanic/script_responses.cpp
    devtools/create_titanic/script_responses.h
    devtools/create_titanic/script_states.cpp
    devtools/create_titanic/script_states.h


diff --git a/devtools/create_titanic/script_preresponses.cpp b/devtools/create_titanic/script_preresponses.cpp
index 53709ae7373..6c17640f762 100644
--- a/devtools/create_titanic/script_preresponses.cpp
+++ b/devtools/create_titanic/script_preresponses.cpp
@@ -25,6 +25,8 @@
 #include "file.h"
 #include "script_preresponses.h"
 
+extern void writeEntryHeader(const char *name, uint offset, uint size);
+
 static const PreResponse BARBOT_PRERESPONSES_EN[] = {
 	{ 0x0CA02, 0x3D102 },
 	{ 0x0CA68, 0x3D102 },
diff --git a/devtools/create_titanic/script_preresponses.h b/devtools/create_titanic/script_preresponses.h
index 99ab6ef95db..358bf049c37 100644
--- a/devtools/create_titanic/script_preresponses.h
+++ b/devtools/create_titanic/script_preresponses.h
@@ -30,7 +30,6 @@ struct PreResponse {
 };
 
 extern void writeAllScriptPreResponses();
-extern void writeEntryHeader(const char *name, uint offset, uint size);
 extern uint dataOffset;
 
 #endif
diff --git a/devtools/create_titanic/script_quotes.cpp b/devtools/create_titanic/script_quotes.cpp
index 40f3be70711..3def978d76a 100644
--- a/devtools/create_titanic/script_quotes.cpp
+++ b/devtools/create_titanic/script_quotes.cpp
@@ -25,6 +25,8 @@
 #include "file.h"
 #include "script_quotes.h"
 
+extern void writeEntryHeader(const char *name, uint offset, uint size);
+
 static const ScriptQuote BARBOT_QUOTES[] = {
 	{ 0x0003d722, 0x0003d372, 0x0000001e },
 	{ 0x0003d722, 0x0003d372, 0x00000032 },
diff --git a/devtools/create_titanic/script_quotes.h b/devtools/create_titanic/script_quotes.h
index 383691c64e2..ed67746bc9a 100644
--- a/devtools/create_titanic/script_quotes.h
+++ b/devtools/create_titanic/script_quotes.h
@@ -31,7 +31,6 @@ struct ScriptQuote {
 };
 
 extern void writeAllScriptQuotes();
-extern void writeEntryHeader(const char *name, uint offset, uint size);
 extern uint dataOffset;
 
 #endif
diff --git a/devtools/create_titanic/script_ranges.cpp b/devtools/create_titanic/script_ranges.cpp
index 22b3063af05..9a51143ec74 100644
--- a/devtools/create_titanic/script_ranges.cpp
+++ b/devtools/create_titanic/script_ranges.cpp
@@ -25,6 +25,8 @@
 #include "file.h"
 #include "script_ranges.h"
 
+extern void writeEntryHeader(const char *name, uint offset, uint size);
+
 const uint BARBOT_RANGE1[] = { 250062, 250064, 250065, 250066, 250067, 250068, 250069, 250070, 250071, 250063, 0 };
 const uint BARBOT_RANGE2[] = { 250200, 250201, 250202, 250203, 250204, 250205, 250206, 250207, 0 };
 const uint BARBOT_RANGE3[] = { 250160, 250161, 250162, 250163, 0 };
diff --git a/devtools/create_titanic/script_ranges.h b/devtools/create_titanic/script_ranges.h
index 9dd4a62ffae..c85f839d7ca 100644
--- a/devtools/create_titanic/script_ranges.h
+++ b/devtools/create_titanic/script_ranges.h
@@ -32,7 +32,6 @@ struct ScriptRange {
 };
 
 extern void writeAllScriptRanges();
-extern void writeEntryHeader(const char *name, uint offset, uint size);
 extern uint dataOffset;
 
 #endif
diff --git a/devtools/create_titanic/script_responses.cpp b/devtools/create_titanic/script_responses.cpp
index e8b3b2f5337..de861d46b0b 100644
--- a/devtools/create_titanic/script_responses.cpp
+++ b/devtools/create_titanic/script_responses.cpp
@@ -25,6 +25,8 @@
 #include "file.h"
 #include "script_responses.h"
 
+extern void writeEntryHeader(const char *name, uint offset, uint size);
+
 static const int DESKBOT_RESPONSES[128][5] = {
 	{ MKTAG('P','K','U','P'), 240573, 0, 0, 0 },
 	{ MKTAG('S','E','X','1'), 240573, 0, 0, 0 },
diff --git a/devtools/create_titanic/script_responses.h b/devtools/create_titanic/script_responses.h
index 2d8d1fc0caa..1f79aac1f7b 100644
--- a/devtools/create_titanic/script_responses.h
+++ b/devtools/create_titanic/script_responses.h
@@ -25,7 +25,6 @@
 #include "common/scummsys.h"
 
 extern void writeAllScriptResponses();
-extern void writeEntryHeader(const char *name, uint offset, uint size);
 extern uint dataOffset;
 
 #endif
diff --git a/devtools/create_titanic/script_states.cpp b/devtools/create_titanic/script_states.cpp
index 2b4201c5b36..3aa7e999119 100644
--- a/devtools/create_titanic/script_states.cpp
+++ b/devtools/create_titanic/script_states.cpp
@@ -25,6 +25,8 @@
 #include "file.h"
 #include "script_states.h"
 
+extern void writeEntryHeader(const char *name, uint offset, uint size);
+
 static const UpdateState12 BARBOT_STATES[] = {
 	{ 0x0003AB24, 0x00000005, 0x00 },
 	{ 0x0003AD33, 0x00000005, 0x00 },
diff --git a/devtools/create_titanic/script_states.h b/devtools/create_titanic/script_states.h
index 2853b087c75..0787032c9a9 100644
--- a/devtools/create_titanic/script_states.h
+++ b/devtools/create_titanic/script_states.h
@@ -36,7 +36,6 @@ struct UpdateState8 {
 };
 
 extern void writeAllUpdateStates();
-extern void writeEntryHeader(const char *name, uint offset, uint size);
 extern uint dataOffset;
 
 #endif

More information about the Scummvm-git-logs mailing list