[Scummvm-cvs-logs] CVS: scummvm/queen resource.h,1.35,1.35.2.1 logic.cpp,1.187.2.2,1.187.2.3

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16949

Modified Files:
      Tag: branch-0-6-0
	resource.h logic.cpp 
Log Message:
simplified alt_intro check

Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.h,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -d -r1.35 -r1.35.2.1
--- resource.h	11 Feb 2004 21:07:39 -0000	1.35
+++ resource.h	28 Feb 2004 07:33:45 -0000	1.35.2.1
@@ -92,6 +92,7 @@
 	bool isDemo() const { return !strcmp(_versionString, "PE100"); }
 	bool isInterview() const { return !strcmp(_versionString, "PEint"); }
 	bool isFloppy() const { return _versionString[0] == 'P'; }
+	bool isCD() const { return _versionString[0] == 'C'; }
 	uint8 compression() const { return _compression; }
 	const char *JASVersion() const { return _versionString; }
 	Language getLanguage() const;

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.187.2.2
retrieving revision 1.187.2.3
diff -u -d -r1.187.2.2 -r1.187.2.3
--- logic.cpp	28 Feb 2004 06:34:17 -0000	1.187.2.2
+++ logic.cpp	28 Feb 2004 07:33:45 -0000	1.187.2.3
@@ -2131,7 +2131,7 @@
 
 		// XXX enable talking for talkie version
 
-		if (ConfMan.getBool("alt_intro") && !_vm->resource()->isDemo() && !_vm->resource()->isInterview() && !_vm->resource()->isFloppy()) {
+		if (ConfMan.getBool("alt_intro") && _vm->resource()->isCD()) {
 			playCutaway("cintr.cut");
 		} else {
 			playCutaway("cdint.cut");