[Scummvm-git-logs] scummvm master -> 6b35ac73d0056e19d9265fe3d31a9768230b5a8c

[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:
05ceebda05 M4: Enum fixes, method rename in room 143
6b35ac73d0 M4: Workaround for empty plates disappearing when Burl leaves


Commit: 05ceebda05f36b77535047380bae318777299803
    https://github.com/scummvm/scummvm/commit/05ceebda05f36b77535047380bae318777299803
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-19T17:10:36-08:00

Commit Message:
M4: Enum fixes, method rename in room 143

Changed paths:
    engines/m4/burger/rooms/section1/room143.cpp
    engines/m4/burger/rooms/section1/room143.h


diff --git a/engines/m4/burger/rooms/section1/room143.cpp b/engines/m4/burger/rooms/section1/room143.cpp
index 1bc7e03131e..68c56046c14 100644
--- a/engines/m4/burger/rooms/section1/room143.cpp
+++ b/engines/m4/burger/rooms/section1/room143.cpp
@@ -197,7 +197,7 @@ void Room143::init() {
 	}
 
 	if (_G(flags)[V000] == 1004) {
-		loadMoney();
+		showEmptyPlates();
 		series_play("143money", 0xf02, 0, -1, 600, -1, 100, 0, 0, 0, 0);
 	} else {
 		hotspot_set_active("money ", false);
@@ -855,7 +855,7 @@ void Room143::daemon() {
 				Series::series_play("143bu11", 0xa00, 0, kCHANGE_BURL_ANIMATION);
 				break;
 
-			case kCHANGE_BURL_ANIMATION:
+			case 45:
 				series_load("143money");
 				series_play_with_breaks(PLAY8, "143bu24", 0xe00, 1, 3);
 				break;
@@ -872,7 +872,7 @@ void Room143::daemon() {
 			_G(flags)[V063] = 0;
 
 			_burlMode = 31;
-			loadMoney();
+			showEmptyPlates();
 			Series::series_play("143bu25", 0xa00, 2, kCHANGE_BURL_ANIMATION);
 			break;
 
@@ -1014,6 +1014,7 @@ void Room143::daemon() {
 				break;
 
 			default:
+				_burlMode = 42;
 				Series::series_play("143bu20", 0xa00, 2, kCHANGE_BURL_ANIMATION, 6, 0, 100, 0, 0, 0, 7);
 				break;
 			}
@@ -1021,7 +1022,7 @@ void Room143::daemon() {
 
 		case 46:
 			digi_stop(3);
-			loadMoney();
+			showEmptyPlates();
 			series_load("143money");
 			series_play_with_breaks(PLAY8, "143bu24", 0xe00, 1, 3);
 			break;
@@ -1122,7 +1123,7 @@ void Room143::daemon() {
 		} else if (player_commands_allowed() && _G(player).walker_visible && INTERFACE_VISIBLE) {
 			_burlShould = 31;
 		} else {
-			kernel_timing_trigger(60, 10030);
+			kernel_timing_trigger(60, kBurlStopsEating);
 		}
 		break;
 
@@ -1142,7 +1143,7 @@ void Room143::daemon() {
 			_burlShould = 45;
 			hotspot_set_active("burl", false);
 		} else {
-			kernel_timing_trigger(60, 10031);
+			kernel_timing_trigger(60, kBurlLeavesTown);
 		}
 		break;
 
@@ -1496,7 +1497,7 @@ void Room143::loadCheese() {
 	_cheese = series_play("143CHES", 0xf00, 0, -1, 600, -1, 100, 35, -5, 0, 0);
 }
 
-void Room143::loadMoney() {
+void Room143::showEmptyPlates() {
 	Series::series_play("143pl01", 0xf00, 0, -1, 600, -1, 100, 0, 0, 0, 0);
 }
 
diff --git a/engines/m4/burger/rooms/section1/room143.h b/engines/m4/burger/rooms/section1/room143.h
index b22d3e6e789..439b150bf42 100644
--- a/engines/m4/burger/rooms/section1/room143.h
+++ b/engines/m4/burger/rooms/section1/room143.h
@@ -68,7 +68,7 @@ private:
 	void talkToVera();
 	void talkToBurl();
 	void loadCheese();
-	void loadMoney();
+	void showEmptyPlates();
 	void playDigi1();
 	void playDigi2();
 


Commit: 6b35ac73d0056e19d9265fe3d31a9768230b5a8c
    https://github.com/scummvm/scummvm/commit/6b35ac73d0056e19d9265fe3d31a9768230b5a8c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-19T17:10:36-08:00

Commit Message:
M4: Workaround for empty plates disappearing when Burl leaves

This fixes an original bug where if you have a savegame from
after Burl finishes eating, then when he leaves Vera's diner,
his empty plates disappear.

Changed paths:
    engines/m4/burger/rooms/section1/room143.cpp
    engines/m4/burger/rooms/section1/room143.h


diff --git a/engines/m4/burger/rooms/section1/room143.cpp b/engines/m4/burger/rooms/section1/room143.cpp
index 68c56046c14..d2c154d7872 100644
--- a/engines/m4/burger/rooms/section1/room143.cpp
+++ b/engines/m4/burger/rooms/section1/room143.cpp
@@ -1140,6 +1140,7 @@ void Room143::daemon() {
 			if (_G(player_info).y < 300)
 				ws_walk(213, 287, 0, -1, 2);
 
+			showEmptyPlates();
 			_burlShould = 45;
 			hotspot_set_active("burl", false);
 		} else {
@@ -1498,7 +1499,8 @@ void Room143::loadCheese() {
 }
 
 void Room143::showEmptyPlates() {
-	Series::series_play("143pl01", 0xf00, 0, -1, 600, -1, 100, 0, 0, 0, 0);
+	_emptyPlates.terminate();
+	_emptyPlates.play("143pl01", 0xf00, 0, -1, 600, -1, 100, 0, 0, 0, 0);
 }
 
 void Room143::playDigi1() {
diff --git a/engines/m4/burger/rooms/section1/room143.h b/engines/m4/burger/rooms/section1/room143.h
index 439b150bf42..7acb37b0856 100644
--- a/engines/m4/burger/rooms/section1/room143.h
+++ b/engines/m4/burger/rooms/section1/room143.h
@@ -50,6 +50,7 @@ private:
 	machine *_wi03S = nullptr;
 	machine *_ve03 = nullptr, *_ve03S = nullptr;
 	Series _cat;
+	Series _emptyPlates;
 	noWalkRect *_walk1 = nullptr;
 	const char *_digiName = nullptr;
 	bool _flag1 = false;