[Scummvm-cvs-logs] CVS: scummvm/gob gob.cpp,1.25.2.2,1.25.2.3 gob.h,1.9.2.1,1.9.2.2 module.mk,1.4,1.4.2.1

kirben kirben at users.sourceforge.net
Thu Nov 17 03:05:08 CET 2005


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

Modified Files:
      Tag: branch-0-8-0
	gob.cpp gob.h module.mk 
Log Message:

Back port CD check for gob engine.


Index: gob.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/gob.cpp,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -u -d -r1.25.2.2 -r1.25.2.3
--- gob.cpp	18 Oct 2005 02:11:18 -0000	1.25.2.2
+++ gob.cpp	17 Nov 2005 11:03:02 -0000	1.25.2.3
@@ -58,9 +58,9 @@
 	{"gob1", "Gobliiins (DOS VGA)", GF_GOB1, "a5e232fcd02733c7dffff107d22d36eb"},
 
 	// CD 1.000 version. Multilingual
-	{"gob1", "Gobliiins (CD)", GF_GOB1, "037db48ebce94bdfe42e2c9510da9211"},
+	{"gob1", "Gobliiins (CD)", GF_GOB1 | GF_CD, "037db48ebce94bdfe42e2c9510da9211"},
 	// CD 1.02 version. Multilingual
-	{"gob1", "Gobliiins (CD)", GF_GOB1, "45f9c1162dd7040fd05fd013ccc176e2"},
+	{"gob1", "Gobliiins (CD)", GF_GOB1 | GF_CD, "45f9c1162dd7040fd05fd013ccc176e2"},
 
 	{"gob1", "Gobliiins (Amiga)", GF_GOB1, "d9f8736b7dc0ea891cd06592a72e8a72"},
 	{"gob1", "Gobliiins (Amiga)", GF_GOB1, "69f9ae85252271e7dfa62883e581e5e9"},
@@ -244,6 +244,10 @@
 		_system->initSize(320, 200);
 	_system->endGFXTransaction();
 
+	// On some systems it's not safe to run CD audio games from the CD.
+	if (_features & GF_CD)
+		checkCD();
+
 	int cd_num = ConfMan.getInt("cdrom");
 	if (cd_num >= 0)
 		_system->openCD(cd_num);

Index: gob.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/gob.h,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -d -r1.9.2.1 -r1.9.2.2
--- gob.h	18 Oct 2005 02:11:18 -0000	1.9.2.1
+++ gob.h	17 Nov 2005 11:03:03 -0000	1.9.2.2
@@ -42,7 +42,8 @@
 	GF_GOB1 = 1 << 0,
 	GF_GOB2 = 1 << 1,
 	GF_GOB3 = 1 << 2,
-	GF_WOODRUFF = 1 << 3
+	GF_WOODRUFF = 1 << 3,
+	GF_CD = 1 << 4
 };
 
 namespace Gob {

Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/module.mk,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- module.mk	13 Apr 2005 18:27:28 -0000	1.4
+++ module.mk	17 Nov 2005 11:03:03 -0000	1.4.2.1
@@ -8,6 +8,7 @@
 	gob/driver_vga.o \
 	gob/game.o \
 	gob/global.o \
+	gob/gob.o \
 	gob/goblin.o \
 	gob/init.o \
 	gob/inter.o \
@@ -17,11 +18,10 @@
 	gob/palanim.o \
 	gob/parse.o \
 	gob/scenery.o \
-	gob/util.o \
-	gob/video.o \
 	gob/sound.o \
 	gob/timer.o \
-	gob/gob.o
+	gob/util.o \
+	gob/video.o
 
 MODULE_DIRS += \
 	gob





More information about the Scummvm-git-logs mailing list