Add support for skipping swampy introduction

svn-id: r24041

3 files changed, 12 insertions, 4 deletions

diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 18341c5815..f3b971cb43 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -262,6 +262,7 @@ AGOSEngine::AGOSEngine(OSystem *syst)
 	_unkPalFlag = 0;
 	_exitCutscene = 0;
 	_paletteFlag = 0;
+	_picture8600 = 0;
 
 	_soundFileId = 0;
 	_lastMusicPlayed = 0;
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 34b444b48b..ff5e647831 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -362,7 +362,7 @@ protected:
 	uint16 _noOverWrite;
 	bool _rejectBlock;
 
-	bool _exitCutscene;
+	bool _exitCutscene, _picture8600;
 
 	uint _soundFileId;
 	int16 _lastMusicPlayed;
diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp
index 8fe15a3ecf..3c752c5f05 100644
--- a/engines/agos/items.cpp
+++ b/engines/agos/items.cpp
@@ -1172,6 +1172,8 @@ void AGOSEngine::o_picture() {
 	uint vga_res = getVarOrWord();
 	uint mode = getVarOrByte();
 
+	_picture8600 = (vga_res == 8600);
+
 	if (mode == 4)
 		vc29_stopAllSounds();
 
@@ -2776,9 +2778,14 @@ void AGOSEngine::waitForMark(uint i) {
 	_exitCutscene = false;
 	while (!(_marks & (1 << i))) {
 		if (_exitCutscene) {
-			if (getBitFlag(9)) {
-				endCutscene();
-				break;
+			if (getGameType() == GType_PP) {
+				if (_picture8600)
+					break;
+			} else {
+				if (getBitFlag(9)) {
+					endCutscene();
+					break;
+				}
 			}
 		} else {
 			processSpecialKeys();