[Scummvm-git-logs] scummvm master -> a16a36e47d80a76f58c92141ab78e5ef01c60936

[digitall]

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:
a16a36e47d GOT: Fix Various GCC Compiler Warnings


Commit: a16a36e47d80a76f58c92141ab78e5ef01c60936
    https://github.com/scummvm/scummvm/commit/a16a36e47d80a76f58c92141ab78e5ef01c60936
Author: D G Turner (digitall at scummvm.org)
Date: 2025-01-12T20:09:44Z

Commit Message:
GOT: Fix Various GCC Compiler Warnings

Changed paths:
    engines/got/game/move_patterns.cpp
    engines/got/game/move_patterns.h


diff --git a/engines/got/game/move_patterns.cpp b/engines/got/game/move_patterns.cpp
index 904a4efb6f9..f6fb76fc8b1 100644
--- a/engines/got/game/move_patterns.cpp
+++ b/engines/got/game/move_patterns.cpp
@@ -38,15 +38,13 @@ namespace Got {
 #define TILE_FLY 140
 #define TILE_SPECIAL 200
 
-extern int (*dialog_func[])(ACTOR *actr);
-
 int check_special_move1(int x, int y, ACTOR *actr);
 
 int check_move0(int x, int y, ACTOR *actr);
 int check_move1(int x, int y, ACTOR *actr);
-int check_move2(int x, int y, ACTOR *actr);
-int check_move3(int x, int y, ACTOR *actr);
-int check_move4(int x, int y, ACTOR *actr);
+//int check_move2(int x, int y, ACTOR *actr);
+//int check_move3(int x, int y, ACTOR *actr);
+//int check_move4(int x, int y, ACTOR *actr);
 
 int movement_zero(ACTOR *actr);
 int movement_one(ACTOR *actr);
@@ -308,7 +306,7 @@ int check_move0(int x, int y, ACTOR *actr) {
 	if (_G(thor)->dir > 1)
 		x2 = x + 12;
 	else
-		x2 = x + 12; // CHECKME : in check_move0() it's 10
+		x2 = x + 12; // FIXME : This causes a duplicate branch warning in GCC. Need to check as in check_move0() it's 10
 	
 	y2 = y + 15;
 
diff --git a/engines/got/game/move_patterns.h b/engines/got/game/move_patterns.h
index a6154316fe6..df7b0474815 100644
--- a/engines/got/game/move_patterns.h
+++ b/engines/got/game/move_patterns.h
@@ -27,10 +27,10 @@
 namespace Got {
 
 extern int (*const movement_func[]) (ACTOR *actr);
-extern int check_move2(int x, int y, ACTOR *actr);
-extern int check_move3(int x, int y, ACTOR *actr);
-extern int check_move4(int x, int y, ACTOR *actr);
-extern void set_thor_vars();
+int check_move2(int x, int y, ACTOR *actr);
+int check_move3(int x, int y, ACTOR *actr);
+int check_move4(int x, int y, ACTOR *actr);
+void set_thor_vars();
 
 } // namespace Got