[Scummvm-git-logs] scummvm master -> 10fda7b7f73e50fafbc9cc266969df2f8d5fb13e

[SupSuper]

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

Summary:
10fda7b7f7 WATCHMAKER: Fix MSVC linker failure caused by using C-style local prototypes, which are prototyped into the global scope


Commit: 10fda7b7f73e50fafbc9cc266969df2f8d5fb13e
    https://github.com/scummvm/scummvm/commit/10fda7b7f73e50fafbc9cc266969df2f8d5fb13e
Author: elasota (ejlasota at gmail.com)
Date: 2023-05-02T08:55:36+01:00

Commit Message:
WATCHMAKER: Fix MSVC linker failure caused by using C-style local prototypes, which are prototyped into the global scope instead of the Watchmaker namespace

Changed paths:
    engines/watchmaker/classes/do_keyboard.cpp
    engines/watchmaker/ll/ll_diary.cpp


diff --git a/engines/watchmaker/classes/do_keyboard.cpp b/engines/watchmaker/classes/do_keyboard.cpp
index a2efe4d26cc..a8763047572 100644
--- a/engines/watchmaker/classes/do_keyboard.cpp
+++ b/engines/watchmaker/classes/do_keyboard.cpp
@@ -58,6 +58,8 @@ uint16 bnd_lev;
 extern int16 NextDlg;   //from doDialog.c
 extern uint8 tasti_per_sfx1;    //from main.c
 
+void t3dLoadOutdoorLights(const char *pname, t3dBODY *b, int32 ora);
+
 void ProcessKBInput() {
 	// TODO: Currently we're polling this in the PollEvent flow.
 	return;
@@ -389,7 +391,6 @@ void ProcessKeyboard(WGame &game) {
 
 
 		if (KeyDown(Common::KEYCODE_LSHIFT)) {
-			void t3dLoadOutdoorLights(const char *pname, t3dBODY * b, int32 ora);
 			if (KeyUp(Common::KEYCODE_F1)) t3dLoadOutdoorLights("c:\\wm\\LMaps\\rxt.t3d", t3dRxt, 1030);
 			if (KeyUp(Common::KEYCODE_F2)) t3dLoadOutdoorLights("c:\\wm\\LMaps\\rxt.t3d", t3dRxt, 1530);
 			if (KeyUp(Common::KEYCODE_F3)) t3dLoadOutdoorLights("c:\\wm\\LMaps\\rxt.t3d", t3dRxt, 1930);
diff --git a/engines/watchmaker/ll/ll_diary.cpp b/engines/watchmaker/ll/ll_diary.cpp
index f25d104688a..c7c64c43f38 100644
--- a/engines/watchmaker/ll/ll_diary.cpp
+++ b/engines/watchmaker/ll/ll_diary.cpp
@@ -38,6 +38,8 @@ namespace Watchmaker {
 
 char bDiariesStoppedByTimeInc = 0;
 
+void t3dLoadOutdoorLights(const char *pname, t3dBODY *b, int32 ora);
+
 /* -----------------26/11/1999 16.19-----------------
  *                      StartDiary
  * --------------------------------------------------*/
@@ -309,7 +311,6 @@ void ContinueDiary(WGame &game, int32 an) {
  *                  UpdateAllClocks
  * --------------------------------------------------*/
 void UpdateAllClocks(WGame &game) {
-	void t3dLoadOutdoorLights(const char *pname, t3dBODY * b, int32 ora);
 	char str[255];
 	t3dMESH *mesh;
 	Init &init = game.init;