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

dreammaster noreply at scummvm.org
Mon Oct 28 06:01:10 UTC 2024


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

Summary:
011a9bed39 M4: RIDDLE: Remove unused ws_nosepick method
ef2b2e86fc M4: RIDDLE: Minor cruncher comments cleanup


Commit: 011a9bed399dba0e0f8851abbdd35a4290d55386
    https://github.com/scummvm/scummvm/commit/011a9bed399dba0e0f8851abbdd35a4290d55386
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-27T22:58:34-07:00

Commit Message:
M4: RIDDLE: Remove unused ws_nosepick method

Changed paths:
    engines/m4/adv_r/adv_walk.cpp
    engines/m4/adv_r/adv_walk.h


diff --git a/engines/m4/adv_r/adv_walk.cpp b/engines/m4/adv_r/adv_walk.cpp
index c5d31111479..bf6cfe5d4c1 100644
--- a/engines/m4/adv_r/adv_walk.cpp
+++ b/engines/m4/adv_r/adv_walk.cpp
@@ -327,17 +327,6 @@ void ws_turn_to_face(machine *myWalker, int32 facing, int32 trigger) {
 	sendWSMessage(TURN_TO_FACE << 16, 0, myWalker, 0, nullptr, 1);
 }
 
-void ws_nosepick(machine *myWalker, int32 seriesHash) {
-	Anim8 *myAnim8;
-	if ((!myWalker) || (!myWalker->myAnim8)) {
-		error_show(FL, 'W:-(');
-		return;
-	}
-	myAnim8 = myWalker->myAnim8;
-	myAnim8->myRegs[IDX_CELS_HASH] = seriesHash << 16;
-	sendWSMessage(NOSEPICK << 16, 0, myWalker, 0, nullptr, 1);
-}
-
 void ws_demand_location(int32 x, int32 y, int facing) {
 	ws_demand_location(_G(my_walker), x, y, facing);
 }
@@ -370,10 +359,6 @@ void ws_turn_to_face(int32 facing, int32 trigger) {
 	ws_turn_to_face(_G(my_walker), facing, trigger);
 }
 
-void ws_nosepick(int32 seriesHash) {
-	ws_nosepick(_G(my_walker), seriesHash);
-}
-
 void ws_hide_walker() {
 	ws_hide_walker(_G(my_walker));
 }
diff --git a/engines/m4/adv_r/adv_walk.h b/engines/m4/adv_r/adv_walk.h
index 02c7fa55b5a..67e77016c46 100644
--- a/engines/m4/adv_r/adv_walk.h
+++ b/engines/m4/adv_r/adv_walk.h
@@ -46,7 +46,6 @@ bool walker_has_walk_finished(machine *sender);
 void ws_demand_location(machine *myWalker, int32 x, int32 y, int facing = -1);
 void ws_demand_facing(machine *myWalker, int32 newFacing);
 void ws_turn_to_face(machine *myWalker, int32 facing, int32 trigger = -1);
-void ws_nosepick(machine *myWalker, int32 seriesHash);
 void ws_hide_walker(machine *myWalker);
 void ws_unhide_walker(machine *myWalker);
 void ws_walk(machine *myWalker, int32 x, int32 y, GrBuff **, int16 trigger, int32 finalFacing, bool complete_walk = true);
@@ -54,7 +53,6 @@ void ws_walk(machine *myWalker, int32 x, int32 y, GrBuff **, int16 trigger, int3
 void ws_demand_location(int32 x, int32 y, int facing = -1);
 void ws_demand_facing(int32 newFacing);
 void ws_turn_to_face(int32 facing, int32 trigger = -1);
-void ws_nosepick(int32 seriesHash);
 void ws_hide_walker();
 void ws_unhide_walker();
 void ws_walk(int32 x, int32 y, GrBuff **buffer, int16 trigger, int32 finalFacing = -1, bool complete_walk = true);
@@ -79,7 +77,6 @@ void ws_walk_dump_series(int16 num_directions, int16 start_hash);
 #define player_hide()                  (ws_hide_walker(_G(my_walker)))
 #define player_unhide()                (ws_unhide_walker(_G(my_walker)))
 #define player_get_info()              (player_update_info(_G(my_walker), &_G(player_info)))
-#define player_nosepick(aa)            (ws_nosepick(_G(my_walker), aa))
 
 
 // New walking stuff


Commit: ef2b2e86fc7c091353a579463c66c8b9d9cc4d12
    https://github.com/scummvm/scummvm/commit/ef2b2e86fc7c091353a579463c66c8b9d9cc4d12
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-27T22:59:31-07:00

Commit Message:
M4: RIDDLE: Minor cruncher comments cleanup

Changed paths:
    engines/m4/dbg/dbg_wscript.cpp
    engines/m4/wscript/ws_cruncher.cpp


diff --git a/engines/m4/dbg/dbg_wscript.cpp b/engines/m4/dbg/dbg_wscript.cpp
index 9bbfd320edc..b323a75bb1a 100644
--- a/engines/m4/dbg/dbg_wscript.cpp
+++ b/engines/m4/dbg/dbg_wscript.cpp
@@ -145,8 +145,7 @@ void dbg_AddParamToCurrMachInstr(const char *param) {
 }
 
 void dbg_EndCurrMachInstr() {
-	if (!strncmp(g_instructionText, "mc ", 3) && _G(game).room_id == 201)
-		debugC(1, kDebugScripts, "%s", g_instructionText);
+	debugC(1, kDebugScripts, "%s", g_instructionText);
 }
 
 void dbg_SetCurrSequInstr(Anim8 *myAnim8, int32 compareCCR) {
diff --git a/engines/m4/wscript/ws_cruncher.cpp b/engines/m4/wscript/ws_cruncher.cpp
index 908dcf60355..1e8725b8d58 100644
--- a/engines/m4/wscript/ws_cruncher.cpp
+++ b/engines/m4/wscript/ws_cruncher.cpp
@@ -958,9 +958,8 @@ static void op_SETCEL(Anim8 *myAnim8) {
 	} else {
 		myRegs[IDX_W] = myCCB->source->w << 16;
 	}
+
 	myRegs[IDX_H] = myCCB->source->h << 16;
-	// MyRegs[IDX_CELS_HASH] = ((uint32)*_GWS(myArg1)) >> 8;
-	// MyRegs[IDX_CELS_INDEX] = myIndex << 16;
 	_GWS(mapTheCel) = true;
 }
 




More information about the Scummvm-git-logs mailing list