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

[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:
a6c0a1b88a M4: Fix Various GCC Compiler Warnings


Commit: a6c0a1b88a67b345e55f831583545f4710d6f61a
    https://github.com/scummvm/scummvm/commit/a6c0a1b88a67b345e55f831583545f4710d6f61a
Author: D G Turner (digitall at scummvm.org)
Date: 2023-12-25T20:38:58Z

Commit Message:
M4: Fix Various GCC Compiler Warnings

These are mainly from -Wredundant-decls i.e. duplicated header definitions

Changed paths:
    engines/m4/adv_r/adv_trigger.h
    engines/m4/burger/gui/game_menu.h
    engines/m4/graphics/gr_font.h
    engines/m4/gui/gui_buffer.h
    engines/m4/wscript/ws_hal.cpp


diff --git a/engines/m4/adv_r/adv_trigger.h b/engines/m4/adv_r/adv_trigger.h
index 3232bb022ee..84093e46277 100644
--- a/engines/m4/adv_r/adv_trigger.h
+++ b/engines/m4/adv_r/adv_trigger.h
@@ -53,11 +53,6 @@ struct Triggers {
 extern int32 kernel_trigger_create(int32 trigger_num);
 extern int32 kernel_trigger_create_mode(int32 trigger_num, int32 desired_mode);
 
-/**
- * Dispatches a trigger
- */
-extern bool kernel_trigger_dispatchx(int32 trigger_num);
-
 /**
  * Dispatches a trigger.
  * @returns		Returns true if the trigger was handled. If the trigger is for
diff --git a/engines/m4/burger/gui/game_menu.h b/engines/m4/burger/gui/game_menu.h
index c9f7b7b834e..f6e6118ceff 100644
--- a/engines/m4/burger/gui/game_menu.h
+++ b/engines/m4/burger/gui/game_menu.h
@@ -508,8 +508,6 @@ struct MenuGlobals {
 	int32 remember_digestability;		// For cancelling out of the options menu
 };
 
-extern void CreateGameMenu(RGB8 *myPalette);
-extern void CreateGameMenuFromMain(RGB8 *myPalette);
 extern void CreateGameMenuMain(RGB8 *myPalette);
 
 } // namespace GUI
diff --git a/engines/m4/graphics/gr_font.h b/engines/m4/graphics/gr_font.h
index 3f27f384064..0145ba99629 100644
--- a/engines/m4/graphics/gr_font.h
+++ b/engines/m4/graphics/gr_font.h
@@ -55,7 +55,6 @@ int32 gr_font_string_width(const Common::String &str, int32 auto_spacing = 1);
 Font *gr_font_load(const char *fontName);
 
 extern void font_set_colors(uint8 alt1, uint8 alt2, uint8 foreground);
-extern void gr_font_set_color(uint8 foreground);
 
 } // namespace M4
 
diff --git a/engines/m4/gui/gui_buffer.h b/engines/m4/gui/gui_buffer.h
index cfc36edb18d..a09fd4267cf 100644
--- a/engines/m4/gui/gui_buffer.h
+++ b/engines/m4/gui/gui_buffer.h
@@ -53,9 +53,6 @@ extern void gui_buffer_system_shutdown();
 					Any changes to the contents will be made by the user.
  */
 extern bool gui_buffer_register(int32 x1, int32 y1, Buffer *myBuf, uint32 scrnFlags, EventHandler evtHandler);
-
-extern bool gui_GrBuff_register(int32 x1, int32 y1, GrBuff *myBuf, uint32 scrnFlags, EventHandler evtHandler);
-
 extern void gui_buffer_deregister(void *myBuf);
 
 extern bool gui_GrBuff_register(int32 x1, int32 y1, GrBuff *myBuf, uint32 scrnFlags, EventHandler evtHandler);
diff --git a/engines/m4/wscript/ws_hal.cpp b/engines/m4/wscript/ws_hal.cpp
index 6dd75f4d58a..5650ee31243 100644
--- a/engines/m4/wscript/ws_hal.cpp
+++ b/engines/m4/wscript/ws_hal.cpp
@@ -162,7 +162,6 @@ static void drawSprite(CCB *myCCB, Anim8 *myAnim8, Buffer *halScrnBuf, Buffer *s
 	assert(myCCB->currLocation);
 	Buffer Destination;
 	DrawRequest dr;
-	RendCell Frame;
 
 	Destination.w = source->w;
 	Destination.h = source->h;
@@ -181,6 +180,9 @@ static void drawSprite(CCB *myCCB, Anim8 *myAnim8, Buffer *halScrnBuf, Buffer *s
 	dr.ICT = ICT;
 	dr.srcDepth = myCCB->layer >> 8;
 
+// FIXME: Unused Code. Remove?
+#if 0
+	RendCell Frame;
 	Frame.hot_x = myCCB->source->xOffset;
 	Frame.hot_y = myCCB->source->yOffset;
 	Frame.Width = source->w;
@@ -192,6 +194,7 @@ static void drawSprite(CCB *myCCB, Anim8 *myAnim8, Buffer *halScrnBuf, Buffer *s
 		Frame.Comp = (uint32)source->encoding;
 	}
 	Frame.data = source->data;
+#endif
 
 	// And draw the sprite
 	gr_sprite_draw(&dr);