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

[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:
1c51799a7a M4: Fix freeze talking to Vipe
a5c59eec45 M4: Change viper to vipe in room 145


Commit: 1c51799a7a4da99cdc041c600dc2200ba59b01be
    https://github.com/scummvm/scummvm/commit/1c51799a7a4da99cdc041c600dc2200ba59b01be
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-13T19:03:59-08:00

Commit Message:
M4: Fix freeze talking to Vipe

Changed paths:
    engines/m4/burger/rooms/section1/room145.cpp


diff --git a/engines/m4/burger/rooms/section1/room145.cpp b/engines/m4/burger/rooms/section1/room145.cpp
index f51ae91903d..bbcad53e041 100644
--- a/engines/m4/burger/rooms/section1/room145.cpp
+++ b/engines/m4/burger/rooms/section1/room145.cpp
@@ -836,7 +836,7 @@ void Room145::conv21() {
 			case 9:
 				if (entry <= 0) {
 					roxySpeaking();
-				} else if (entry == 2) {
+				} else if (entry <= 2) {
 					viperSpeaking();
 				}
 				break;


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

Commit Message:
M4: Change viper to vipe in room 145

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


diff --git a/engines/m4/burger/rooms/section1/room145.cpp b/engines/m4/burger/rooms/section1/room145.cpp
index bbcad53e041..7c15fa91e21 100644
--- a/engines/m4/burger/rooms/section1/room145.cpp
+++ b/engines/m4/burger/rooms/section1/room145.cpp
@@ -530,19 +530,19 @@ void Room145::daemon() {
 	case kCHANGE_VIPE_ANIMATION:
 		switch (_vipeState) {
 		case 39:
-			_viper.terminate();
+			_vipe.terminate();
 			_vipeState = 40;
 			kernel_trigger_dispatch_now(kCHANGE_VIPE_ANIMATION);
 			kernel_trigger_dispatch_now(10001);
 			break;
 
 		case 40:
-			_viper.show("145vp04", 0x300);
+			_vipe.show("145vp04", 0x300);
 			break;
 
 		case 43:
 			player_set_commands_allowed(true);
-			_viper.show("145vp02", 0x300);
+			_vipe.show("145vp02", 0x300);
 			break;
 
 		case 44:
@@ -552,7 +552,7 @@ void Room145::daemon() {
 			if (_roxyTalkTo == 101) {
 				_roxyTalkTo = 100;
 				resetRoxy();
-				_viper.terminate();
+				_vipe.terminate();
 				_vipeState = 45;
 				series_play_with_breaks(PLAY21, "145vp02", 0x300, kCHANGE_VIPE_ANIMATION, 3);
 			} else {
@@ -572,7 +572,7 @@ void Room145::daemon() {
 			break;
 
 		case 47:
-			_viper.terminate();
+			_vipe.terminate();
 			_vipeState = 43;
 			series_play_with_breaks(PLAY23, "145vp02", 0x300, kCHANGE_VIPE_ANIMATION, 3);
 			break;
@@ -821,7 +821,7 @@ void Room145::conv21() {
 			case 2:
 			case 7:
 			case 12:
-				viperSpeaking();
+				vipeSpeaking();
 				break;
 
 			case 3:
@@ -837,13 +837,13 @@ void Room145::conv21() {
 				if (entry <= 0) {
 					roxySpeaking();
 				} else if (entry <= 2) {
-					viperSpeaking();
+					vipeSpeaking();
 				}
 				break;
 
 			case 10:
 				if (entry <= 0) {
-					viperSpeaking();
+					vipeSpeaking();
 				} else if (entry == 1) {
 					roxySpeaking();
 				}
@@ -919,11 +919,11 @@ void Room145::conv23() {
 	}
 }
 
-void Room145::viperSpeaking() {
-	_viper.terminate();
+void Room145::vipeSpeaking() {
+	_vipe.terminate();
 	_vipeState = 39;
 	digi_play(conv_sound_to_play(), 1, 255, 5);
-	_viper.play("145vp04", 0x300, 4, -1., 6, -1);
+	_vipe.play("145vp04", 0x300, 4, -1., 6, -1);
 }
 
 void Room145::roxySpeaking() {
diff --git a/engines/m4/burger/rooms/section1/room145.h b/engines/m4/burger/rooms/section1/room145.h
index 2c0042893fe..ae3023259fb 100644
--- a/engines/m4/burger/rooms/section1/room145.h
+++ b/engines/m4/burger/rooms/section1/room145.h
@@ -63,7 +63,7 @@ private:
 	noWalkRect *_walk2 = nullptr;
 	noWalkRect *_walk3 = nullptr;
 	machine *_amplifier = nullptr;
-	Series _viper;
+	Series _vipe;
 	Series _roxy;
 	const char *_digiName1 = nullptr;
 	const char *_digiName2 = nullptr;
@@ -80,7 +80,7 @@ private:
 	void conv21();
 	void conv22();
 	void conv23();
-	void viperSpeaking();
+	void vipeSpeaking();
 	void roxySpeaking();
 	void loadSeries1();
 	int getRandomDrumzState() const;