[Scummvm-git-logs] scummvm master -> 8dd6ffea429300466b20856f1999a2635b14802f

dreammaster noreply at scummvm.org
Thu Jan 11 06:01:43 UTC 2024


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:
8dd6ffea42 M4: Further -1 cast fixes in walk code


Commit: 8dd6ffea429300466b20856f1999a2635b14802f
    https://github.com/scummvm/scummvm/commit/8dd6ffea429300466b20856f1999a2635b14802f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-01-10T22:01:34-08:00

Commit Message:
M4: Further -1 cast fixes in walk code

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


diff --git a/engines/m4/adv_r/adv_walk.cpp b/engines/m4/adv_r/adv_walk.cpp
index c4649b8b531..fe991d455ed 100644
--- a/engines/m4/adv_r/adv_walk.cpp
+++ b/engines/m4/adv_r/adv_walk.cpp
@@ -237,7 +237,7 @@ void ws_custom_walk(machine *myWalker, int32 finalFacing, int32 trigger, bool co
 	if (finalFacing > 0 && finalFacing < 13) {
 		_G(globals)[GLB_TEMP_4] = directions[finalFacing] << 16;
 	} else {
-		_G(globals)[GLB_TEMP_4] = (uint)-1 << 16;
+		_G(globals)[GLB_TEMP_4] = (frac16)-1 << 16;
 	}
 
 	// Set the trigger to be returned when the walk is finished
@@ -318,7 +318,7 @@ void ws_turn_to_face(machine *myWalker, int32 facing, int32 trigger) {
 	if (facing > 0 && facing < 13) {
 		_G(globals)[GLB_TEMP_4] = directions[facing] << 16;
 	} else {
-		_G(globals)[GLB_TEMP_4] = (uint)-1 << 16;
+		_G(globals)[GLB_TEMP_4] = (frac16)-1 << 16;
 	}
 
 	// Set the trigger to be returned when the walk is finished




More information about the Scummvm-git-logs mailing list