[Scummvm-cvs-logs] CVS: scummvm/common util.cpp,1.60.2.3,1.60.2.4 util.h,1.56.2.3,1.56.2.4

Max Horn fingolfin at users.sourceforge.net
Fri Jan 20 14:39:01 CET 2006


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

Modified Files:
      Tag: branch-0-8-0
	util.cpp util.h 
Log Message:
Backport changes from HEAD (now 0.8.x branch compiles again)

Index: util.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.cpp,v
retrieving revision 1.60.2.3
retrieving revision 1.60.2.4
diff -u -d -r1.60.2.3 -r1.60.2.4
--- util.cpp	18 Jan 2006 18:07:27 -0000	1.60.2.3
+++ util.cpp	20 Jan 2006 22:37:57 -0000	1.60.2.4
@@ -166,9 +166,11 @@
 
 
 const PlatformDescription g_platforms[] = {
+	{"acorn", "acorn", "Acorn", kPlatformAcorn},
 	{"amiga", "ami", "Amiga", kPlatformAmiga},
 	{"atari", "atari-st", "Atari ST", kPlatformAtariST},
 	{"c64", "c64", "Commodore 64", kPlatformC64},
+	{"pc", "dos", "DOS", kPlatformPC},
 
 	// The 'official' spelling seems to be "FM-TOWNS" (e.g. in the Indy4 demo).
 	// However, on the net many variations can be seen, like "FMTOWNS",
@@ -178,7 +180,7 @@
 	{"linux", "linux", "Linux", kPlatformLinux},
 	{"macintosh", "mac", "Macintosh", kPlatformMacintosh},
 	{"nes", "nes", "NES", kPlatformNES},
-	{"pc", "dos", "DOS", kPlatformPC},
+	{"segacd", "segacd", "SegaCD", kPlatformSegaCD},
 	{"windows", "win", "Windows", kPlatformWindows},
 
 	{0, 0, "Default", kPlatformUnknown}

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.h,v
retrieving revision 1.56.2.3
retrieving revision 1.56.2.4
diff -u -d -r1.56.2.3 -r1.56.2.4
--- util.h	18 Jan 2006 18:07:27 -0000	1.56.2.3
+++ util.h	20 Jan 2006 22:37:57 -0000	1.56.2.4
@@ -140,9 +140,10 @@
 	kPlatformWindows = 5,
 	kPlatformNES = 6,
 	kPlatformC64 = 7,
-	kPlatformLinux = 8
+	kPlatformLinux = 8,
+	kPlatformAcorn = 9,
+	kPlatformSegaCD = 10
 /*
-	kPlatformSEGA,
 	kPlatformPCEngine
 */
 };





More information about the Scummvm-git-logs mailing list