[Scummvm-git-logs] scummvm branch-2-6 -> 185636ba4ce44e70f8ef41b476396dc6b6ee5c0c

[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:
6bb2ba6283 CHEWY: Add some quit checks to room 3
185636ba4c CHEWY: Quit game after endgame credits


Commit: 6bb2ba6283078463d8d7ecf1acffb2ec7bf33da1
    https://github.com/scummvm/scummvm/commit/6bb2ba6283078463d8d7ecf1acffb2ec7bf33da1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-06-30T19:14:28-07:00

Commit Message:
CHEWY: Add some quit checks to room 3

Changed paths:
    engines/chewy/rooms/room03.cpp


diff --git a/engines/chewy/rooms/room03.cpp b/engines/chewy/rooms/room03.cpp
index d35667d1fec..b3bfe4e9107 100644
--- a/engines/chewy/rooms/room03.cpp
+++ b/engines/chewy/rooms/room03.cpp
@@ -196,8 +196,10 @@ void Room3::probeCreak() {
 	_G(auto_mov_obj)[SONDE_OBJ].Mode = true;
 	init_auto_obj(SONDE_OBJ, &SONDE_PHASEN[0][0], 3, (MovLine*)sonde_mpkt1);
 	_G(flags).AniUserAction = false;
-	while (_G(mov_phasen)[SONDE_OBJ].Repeat != -1)
+	while (_G(mov_phasen)[SONDE_OBJ].Repeat != -1) {
 		set_ani_screen();
+		SHOULD_QUIT_RETURN;
+	}
 
 	_G(det)->startDetail(SONDE_SHOOT, 1, ANI_FRONT);
 	int16 ende = 0;
@@ -249,7 +251,7 @@ void Room3::probeCreak() {
 	clear_prog_ani();
 	_G(det)->startDetail(SONDE_CLEAR, 1, ANI_BACK);
 	while (_G(det)->get_ani_status(SONDE_CLEAR)) {
-
+		SHOULD_QUIT_RETURN;
 		_G(spr_info)[0] = _G(det)->plot_detail_sprite(0, 0, SONDE_ANI, SONDE_SPR_R, ANI_HIDE);
 		_G(spr_info)[0]._zLevel = 0;
 		set_ani_screen();


Commit: 185636ba4ce44e70f8ef41b476396dc6b6ee5c0c
    https://github.com/scummvm/scummvm/commit/185636ba4ce44e70f8ef41b476396dc6b6ee5c0c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-06-30T19:14:29-07:00

Commit Message:
CHEWY: Quit game after endgame credits

Changed paths:
    engines/chewy/rooms/room89.cpp


diff --git a/engines/chewy/rooms/room89.cpp b/engines/chewy/rooms/room89.cpp
index 3a2a81a4203..c56460da2cb 100644
--- a/engines/chewy/rooms/room89.cpp
+++ b/engines/chewy/rooms/room89.cpp
@@ -143,6 +143,9 @@ void Room89::entry() {
 		_G(out)->fadeOut();
 		_G(out)->setPointer(nullptr);
 		_G(out)->cls();
+
+		// Quit the game
+		g_engine->quitGame();
 	}
 
 	_G(gameState).SVal2 = 0;