[Scummvm-git-logs] scummvm master -> 8245a2c4b15b7b23c5d09ff1c30883c11c76e054

[dreammaster]

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:
f8ed6bfb97 M4: Cleanups for wilbur speech started/finished enums
8245a2c4b1 M4: Fix animating lips for look responses


Commit: f8ed6bfb9774f71bf3bc5c6159ad0b75ee6b0f62
    https://github.com/scummvm/scummvm/commit/f8ed6bfb9774f71bf3bc5c6159ad0b75ee6b0f62
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-13T21:00:02-08:00

Commit Message:
M4: Cleanups for wilbur speech started/finished enums

Changed paths:
    engines/m4/burger/rooms/section1/room102.cpp
    engines/m4/burger/rooms/section1/room138.cpp
    engines/m4/burger/vars.h


diff --git a/engines/m4/burger/rooms/section1/room102.cpp b/engines/m4/burger/rooms/section1/room102.cpp
index 236d694111b..2fcfff33892 100644
--- a/engines/m4/burger/rooms/section1/room102.cpp
+++ b/engines/m4/burger/rooms/section1/room102.cpp
@@ -949,7 +949,7 @@ void Room102::daemon() {
 			kernel_timing_trigger(60, 1037);
 		break;
 
-	case 10013:
+	case kWILBUR_SPEECH_STARTED:
 		break;
 
 	case 10014:
diff --git a/engines/m4/burger/rooms/section1/room138.cpp b/engines/m4/burger/rooms/section1/room138.cpp
index 8784a3cff41..f101680f610 100644
--- a/engines/m4/burger/rooms/section1/room138.cpp
+++ b/engines/m4/burger/rooms/section1/room138.cpp
@@ -613,7 +613,7 @@ void Room138::daemon() {
 		player_set_commands_allowed(false);
 		break;
 
-	case kWILBURS_SPEECH_FINISHED:
+	case kWILBUR_SPEECH_FINISHED:
 		_wilburShould = 1;
 		player_set_commands_allowed(true);
 		_G(kernel).continue_handling_trigger = true;
diff --git a/engines/m4/burger/vars.h b/engines/m4/burger/vars.h
index 637d5a8880b..fadece8554f 100644
--- a/engines/m4/burger/vars.h
+++ b/engines/m4/burger/vars.h
@@ -57,7 +57,7 @@ enum global_triggers {
 	kNPC_SPEECH_STARTED = 10010,	// NPC talk started
 	kNPC_SPEECH_FINISHED = 10011,	// NPC talk finished
 	kWILBUR_SPEECH_STARTED = 10013,
-	kWILBURS_SPEECH_FINISHED = 10014,
+	kWILBUR_SPEECH_FINISHED = 10014,
 	kWILBURS_SPEECH_START = 10015,
 	kCHANGE_WILBUR_ANIMATION = 10016,
 	kAdvanceHour = 10017,


Commit: 8245a2c4b15b7b23c5d09ff1c30883c11c76e054
    https://github.com/scummvm/scummvm/commit/8245a2c4b15b7b23c5d09ff1c30883c11c76e054
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-13T21:09:17-08:00

Commit Message:
M4: Fix animating lips for look responses

Changed paths:
    engines/m4/burger/rooms/section1/room138.cpp
    engines/m4/burger/vars.h
    engines/m4/burger/walker.cpp
    engines/m4/burger/walker.h


diff --git a/engines/m4/burger/rooms/section1/room138.cpp b/engines/m4/burger/rooms/section1/room138.cpp
index f101680f610..8784a3cff41 100644
--- a/engines/m4/burger/rooms/section1/room138.cpp
+++ b/engines/m4/burger/rooms/section1/room138.cpp
@@ -613,7 +613,7 @@ void Room138::daemon() {
 		player_set_commands_allowed(false);
 		break;
 
-	case kWILBUR_SPEECH_FINISHED:
+	case kWILBURS_SPEECH_FINISHED:
 		_wilburShould = 1;
 		player_set_commands_allowed(true);
 		_G(kernel).continue_handling_trigger = true;
diff --git a/engines/m4/burger/vars.h b/engines/m4/burger/vars.h
index fadece8554f..637d5a8880b 100644
--- a/engines/m4/burger/vars.h
+++ b/engines/m4/burger/vars.h
@@ -57,7 +57,7 @@ enum global_triggers {
 	kNPC_SPEECH_STARTED = 10010,	// NPC talk started
 	kNPC_SPEECH_FINISHED = 10011,	// NPC talk finished
 	kWILBUR_SPEECH_STARTED = 10013,
-	kWILBUR_SPEECH_FINISHED = 10014,
+	kWILBURS_SPEECH_FINISHED = 10014,
 	kWILBURS_SPEECH_START = 10015,
 	kCHANGE_WILBUR_ANIMATION = 10016,
 	kAdvanceHour = 10017,
diff --git a/engines/m4/burger/walker.cpp b/engines/m4/burger/walker.cpp
index 30b67ab31ae..664f47372b9 100644
--- a/engines/m4/burger/walker.cpp
+++ b/engines/m4/burger/walker.cpp
@@ -216,7 +216,7 @@ void Walker::wilbur_speech(const char *name, int trigger, int room, byte flags,
 	_room = room;
 	_vol = vol;
 	_trigger = kernel_trigger_create(trigger);
-	_flag = (flags & 1) != 0;
+	_animateLips = (flags & 1) == 0;
 
 	_G(kernel).trigger_mode = KT_DAEMON;
 	kernel_trigger_dispatch_now(kWILBURS_SPEECH_START);
@@ -226,7 +226,7 @@ void Walker::wilbur_speech(const char *name, int trigger, int room, byte flags,
 void Walker::wilbur_say() {
 	KernelTriggerType oldMode = _G(kernel).trigger_mode;
 
-	if (_flag && _G(player).walker_in_this_scene && _G(player).walker_visible)
+	if (_animateLips && _G(player).walker_in_this_scene && _G(player).walker_visible)
 		sendWSMessage(0x140000, 0, _G(my_walker), 0, 0, 1);
 
 	term_message("wilbur_say:  wilburs_talk_trigger = %d", _trigger);
@@ -264,7 +264,7 @@ bool Walker::wilbur_said(const char *list[][4]) {
 }
 
 void Walker::wilburs_speech_finished() {
-	if (_flag && !_G(player).walker_in_this_scene && !_G(player).walker_visible)
+	if (_animateLips && _G(player).walker_in_this_scene && _G(player).walker_visible)
 		sendWSMessage(0x150000, 0, _G(my_walker), 0, 0, 1);
 
 	term_message("wilburs_speech_finished: dispatching wilburs_talk_trigger = %d", _trigger);
diff --git a/engines/m4/burger/walker.h b/engines/m4/burger/walker.h
index ebf657de81a..15bc25e4cc5 100644
--- a/engines/m4/burger/walker.h
+++ b/engines/m4/burger/walker.h
@@ -50,7 +50,7 @@ private:
 	int _room = 0;
 	int _vol = 0;
 	int32 _trigger = 0;
-	bool _flag = false;
+	bool _animateLips = false;
 	int _wilburPoof = -1;
 
 	/**