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

[Strangerke]

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:
d63b7c98a5 M4: Initialize object in adv_player (courtesy of eriktorbjorn), remove an unimplemented function definition and a useles


Commit: d63b7c98a5fe7c9b355e483d66ccc93f4615e1b8
    https://github.com/scummvm/scummvm/commit/d63b7c98a5fe7c9b355e483d66ccc93f4615e1b8
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-06-09T08:00:56+01:00

Commit Message:
M4: Initialize object in adv_player (courtesy of eriktorbjorn), remove an unimplemented function definition and a useless include

Changed paths:
    engines/m4/adv_r/adv_player.h
    engines/m4/riddle/gui/game_menu.cpp


diff --git a/engines/m4/adv_r/adv_player.h b/engines/m4/adv_r/adv_player.h
index fc4da64b47c..438d334dbac 100644
--- a/engines/m4/adv_r/adv_player.h
+++ b/engines/m4/adv_r/adv_player.h
@@ -38,7 +38,7 @@ struct Player {
 	char verb[MAX_PLYR_STRING_LEN] = { 0 };
 	char noun[MAX_PLYR_STRING_LEN] = { 0 };
 	char prep[MAX_PLYR_STRING_LEN] = { 0 };
-	char object[MAX_PLYR_STRING_LEN];
+	char object[MAX_PLYR_STRING_LEN] = { 0 };
 	char ws_asset_name[32] = { 0 };		// Name of the walker sprite series holder
 	char ws_shadow_name[32] = { 0 };	// Name of the walker sprite series shadow holder
 	int16 walker_type = 0;		// Type of walker (ripley, mei_chin, safari, etc.)
@@ -109,7 +109,6 @@ void player_inform_walker_new_scale(int32 frontY, int32 backY, int32 frontS, int
 bool player_load_series(const char *walkerName, const char *shadowName, bool load_palette);
 void player_first_walk(int32 x1, int32 y1, int32 f1, int32 x2, int32 y2, int32 f2, bool enable_commands_at_destination);
 void player_set_defaults();
-void player_noun_becomes_verb(int32 spriteNum);
 
 void player_hotspot_walk_override(int32 x, int32 y, int32 facing = -1, int32 trigger = -1);
 void player_hotspot_walk_override_just_face(int32 facing, int32 trigger = -1);
diff --git a/engines/m4/riddle/gui/game_menu.cpp b/engines/m4/riddle/gui/game_menu.cpp
index 68e6227cd8c..0d1183ec0b5 100644
--- a/engines/m4/riddle/gui/game_menu.cpp
+++ b/engines/m4/riddle/gui/game_menu.cpp
@@ -27,7 +27,6 @@
 #include "m4/core/imath.h"
 #include "m4/gui/gui_event.h"
 #include "m4/gui/hotkeys.h"
-#include "m4/graphics/gr_sprite.h"
 #include "m4/gui/gui_sys.h"
 #include "m4/gui/gui_vmng.h"
 #include "m4/mem/mem.h"