[Scummvm-git-logs] scummvm master -> 7cbf2001344421fe84703bfdd22e2248a96bac09

bluegr noreply at scummvm.org
Mon Jun 13 20:19:22 UTC 2022


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7cbf200134 CHEWY: Init intro and don't play Chewy's message if intro is skipped


Commit: 7cbf2001344421fe84703bfdd22e2248a96bac09
    https://github.com/scummvm/scummvm/commit/7cbf2001344421fe84703bfdd22e2248a96bac09
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-06-13T23:19:02+03:00

Commit Message:
CHEWY: Init intro and don't play Chewy's message if intro is skipped

Changed paths:
    engines/chewy/r_event.cpp


diff --git a/engines/chewy/r_event.cpp b/engines/chewy/r_event.cpp
index 96dff9537d9..ae9bc0f1ee5 100644
--- a/engines/chewy/r_event.cpp
+++ b/engines/chewy/r_event.cpp
@@ -661,7 +661,7 @@ static void playIntroSequence() {
 	int16 ret = 0;
 
 	_G(atds)->load_atds(98, AAD_DATA);
-
+	setupScreen(DO_SETUP);
 	_G(out)->setPointer(nullptr);
 	_G(out)->cls();
 
@@ -681,7 +681,8 @@ static void playIntroSequence() {
 		SHOULD_QUIT_RETURN;
 	}
 
-	//if (ret == -1) {
+	// Chewy says he's in big trouble
+	if (ret != -1) {
 		_G(out)->setPointer(nullptr);
 		_G(out)->cls();
 		_G(out)->raster_col(254, 62, 35, 7);
@@ -693,7 +694,7 @@ static void playIntroSequence() {
 		} else {
 			delay(6000);
 		}
-	//}
+	}
 
 	_G(out)->setPointer(_G(workptr));
 	_G(out)->cls();




More information about the Scummvm-git-logs mailing list