[Scummvm-git-logs] scummvm master -> 399bdf4bc01e3813aaf81dadf5283b4fad9a1761

[dreammaster]

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:
399bdf4bc0 M4: RIDDLE: Further walker clean up


Commit: 399bdf4bc01e3813aaf81dadf5283b4fad9a1761
    https://github.com/scummvm/scummvm/commit/399bdf4bc01e3813aaf81dadf5283b4fad9a1761
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-07T19:52:42-08:00

Commit Message:
M4: RIDDLE: Further walker clean up

Changed paths:
    engines/m4/riddle/walker.cpp
    engines/m4/riddle/walker.h


diff --git a/engines/m4/riddle/walker.cpp b/engines/m4/riddle/walker.cpp
index 3f1c8ac820c..43eb792de82 100644
--- a/engines/m4/riddle/walker.cpp
+++ b/engines/m4/riddle/walker.cpp
@@ -115,13 +115,15 @@ machine *Walker::walk_initialize_walker() {
 	machine *m;
 	int32 s;
 
-	// Wilbur walker
+	_G(player).walker_visible = true;
+
+	// Default walker
 	_G(player).walker_type = WALKER_PLAYER;
 	_G(player).shadow_type = SHADOW_PLAYER;
 
 	_G(globals)[GLB_TEMP_1] = _G(player).walker_type << 16;
-	_G(globals)[GLB_TEMP_2] = *RIPLEY_SERIES_DIRS << 24;  // starting series hash of default walker	        GAMECTRL loads shadows starting @ 0
-	_G(globals)[GLB_TEMP_3] = *RIPLEY_SHADOWS_DIRS << 24;  // starting series hash of default walker shadows. GAMECTRL loads shadows starting @ 10
+	_G(globals)[GLB_TEMP_2] = *RIPLEY_SERIES_DIRS << 24;	// Starting series hash of default walker
+	_G(globals)[GLB_TEMP_3] = *RIPLEY_SHADOWS_DIRS << 24;	// Starting series hash of default walker shadows
 
 	// initialize with bogus data (this is for the real walker)
 	s = _G(globals)[GLB_MIN_SCALE] + FixedMul((400 << 16) - _G(globals)[GLB_MIN_Y], _G(globals)[GLB_SCALER]);
@@ -132,7 +134,7 @@ machine *Walker::walk_initialize_walker() {
 
 	m = TriggerMachineByHash(WALKER_HASH, nullptr, _G(player).walker_type + WALKER_HASH, 0, player_walker_callback, false, "PLAYER WALKER");
 
-	// we need to all init sequences to happen immediately (init coordinates)
+	// We need to all init sequences to happen immediately (init coordinates)
 	cycleEngines(nullptr, &(_G(currentSceneDef).depth_table[0]),
 		nullptr, (uint8 *)&_G(master_palette)[0], _G(inverse_pal)->get_ptr(), true);
 
@@ -141,13 +143,9 @@ machine *Walker::walk_initialize_walker() {
 	return m;
 }
 
-void Walker::reset_walker_sprites() {
-	error("TODO: reset_walker_sprites");
-}
-
 void Walker::unloadSprites() {
 	if (_G(player).walker_in_this_scene) {
-		term_message("Unloading Wilbur walker...");
+		term_message("Unloading Ripley walker...");
 		player_update_info();
 
 		// Send message for the unload
@@ -186,25 +184,6 @@ void disable_player() {
 	ws_hide_walker(_G(my_walker));
 }
 
-void player_walk_to(int32 x, int32 y, int32 facing_x, int32 facing_y, int trigger) {
-#ifdef TODO
-	_G(player_facing_x) = facing_x;
-	_G(player_facing_y) = facing_y;
-	_G(player_trigger) = trigger;
-	player_hotspot_walk_override(x, y, -1, gSET_FACING);
-#else
-	error("TODO: player_walk_to");
-#endif
-}
-
-void player_walk_to(int32 x, int32 y, int trigger) {
-#ifdef TODO
-	player_walk_to(x, y, _G(hotspot_x), _G(hotspot_y), trigger);
-#else
-	error("TODO: player_walk_to");
-#endif
-}
-
 } // namespace Riddle
 } // namespace M4
 
diff --git a/engines/m4/riddle/walker.h b/engines/m4/riddle/walker.h
index d5e6fbc3445..bf2145e2f99 100644
--- a/engines/m4/riddle/walker.h
+++ b/engines/m4/riddle/walker.h
@@ -57,7 +57,6 @@ public:
 	bool walk_load_walker_and_shadow_series() override;
 	machine *walk_initialize_walker() override;
 
-	void reset_walker_sprites();
 	static void unloadSprites();
 
 	bool ripley_said(const char *const list[][2]);
@@ -65,9 +64,6 @@ public:
 
 void enable_player();
 void disable_player();
-void wilbur_abduct(int trigger);
-void player_walk_to(int32 x, int32 y, int32 facing_x, int32 facing_y, int trigger = -1);
-void player_walk_to(int32 x, int32 y, int trigger = -1);
 
 } // namespace Riddle
 } // namespace M4