[Scummvm-cvs-logs] SF.net SVN: scummvm: [24041] scummvm/trunk/engines/agos

[kirben at users.sourceforge.net]

Revision: 24041
          http://svn.sourceforge.net/scummvm/?rev=24041&view=rev
Author:   kirben
Date:     2006-09-30 06:02:31 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
Add support for skipping swampy introduction

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.cpp
    scummvm/trunk/engines/agos/agos.h
    scummvm/trunk/engines/agos/items.cpp

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2006-09-30 12:39:34 UTC (rev 24040)
+++ scummvm/trunk/engines/agos/agos.cpp	2006-09-30 13:02:31 UTC (rev 24041)
@@ -262,6 +262,7 @@
 	_unkPalFlag = 0;
 	_exitCutscene = 0;
 	_paletteFlag = 0;
+	_picture8600 = 0;
 
 	_soundFileId = 0;
 	_lastMusicPlayed = 0;

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2006-09-30 12:39:34 UTC (rev 24040)
+++ scummvm/trunk/engines/agos/agos.h	2006-09-30 13:02:31 UTC (rev 24041)
@@ -362,7 +362,7 @@
 	uint16 _noOverWrite;
 	bool _rejectBlock;
 
-	bool _exitCutscene;
+	bool _exitCutscene, _picture8600;
 
 	uint _soundFileId;
 	int16 _lastMusicPlayed;

Modified: scummvm/trunk/engines/agos/items.cpp
===================================================================
--- scummvm/trunk/engines/agos/items.cpp	2006-09-30 12:39:34 UTC (rev 24040)
+++ scummvm/trunk/engines/agos/items.cpp	2006-09-30 13:02:31 UTC (rev 24041)
@@ -1172,6 +1172,8 @@
 	uint vga_res = getVarOrWord();
 	uint mode = getVarOrByte();
 
+	_picture8600 = (vga_res == 8600);
+
 	if (mode == 4)
 		vc29_stopAllSounds();
 
@@ -2776,9 +2778,14 @@
 	_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();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.