[Scummvm-git-logs] scummvm master -> 40923700b502453f3b0da22501fdc48071771947

[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:
656582619a M4: Fix crash eating kibble in demo
40923700b5 M4: Don't add money to inventory in demo


Commit: 656582619a37a0962bb9817ff911b618e54f4e81
    https://github.com/scummvm/scummvm/commit/656582619a37a0962bb9817ff911b618e54f4e81
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-08T20:27:43-08:00

Commit Message:
M4: Fix crash eating kibble in demo

Changed paths:
    engines/m4/burger/walker.cpp


diff --git a/engines/m4/burger/walker.cpp b/engines/m4/burger/walker.cpp
index b023a07a058..30b67ab31ae 100644
--- a/engines/m4/burger/walker.cpp
+++ b/engines/m4/burger/walker.cpp
@@ -284,6 +284,12 @@ void disable_player() {
 void wilbur_abduct(int trigger) {
 	player_set_commands_allowed(false);
 	digi_stop(1);
+
+	if (_G(executing) == INTERACTIVE_DEMO) {
+		_G(game).setRoom(608);
+		return;
+	}
+
 	digi_preload("999_004");
 
 	if (_G(my_walker) && _G(player).walker_in_this_scene && _G(player).walker_visible) {


Commit: 40923700b502453f3b0da22501fdc48071771947
    https://github.com/scummvm/scummvm/commit/40923700b502453f3b0da22501fdc48071771947
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-08T20:35:12-08:00

Commit Message:
M4: Don't add money to inventory in demo

Changed paths:
    engines/m4/burger/flags.cpp


diff --git a/engines/m4/burger/flags.cpp b/engines/m4/burger/flags.cpp
index d7ebdb03153..78013adc719 100644
--- a/engines/m4/burger/flags.cpp
+++ b/engines/m4/burger/flags.cpp
@@ -152,7 +152,11 @@ void Flags::schedule_boonsville_time() {
 void Flags::reset1() {
 	set_boonsville_time(0);
 	(*this)[V000] = 1000;
-	inv_give_to_player("money");
+
+	if (_G(executing) == WHOLE_GAME)
+		inv_give_to_player("money");
+	else
+		inv_move_object("money", NOWHERE);
 
 	(*this)[V001] = 20;
 	(*this)[V005] = 0;