[Scummvm-cvs-logs] SF.net SVN: scummvm:[43781] scummvm/trunk/engines/gob

[strangerke at users.sourceforge.net]

Revision: 43781
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43781&view=rev
Author:   strangerke
Date:     2009-08-28 18:14:55 +0000 (Fri, 28 Aug 2009)

Log Message:
-----------
Suppress useless game type for Playtoons CK

Modified Paths:
--------------
    scummvm/trunk/engines/gob/detection.cpp
    scummvm/trunk/engines/gob/gob.cpp
    scummvm/trunk/engines/gob/gob.h

Modified: scummvm/trunk/engines/gob/detection.cpp
===================================================================
--- scummvm/trunk/engines/gob/detection.cpp	2009-08-28 14:33:26 UTC (rev 43780)
+++ scummvm/trunk/engines/gob/detection.cpp	2009-08-28 18:14:55 UTC (rev 43781)
@@ -3311,7 +3311,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -3329,7 +3329,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -3347,7 +3347,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -3370,7 +3370,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640 | kFeaturesSCNDemo,
 		0, 0, 3
 	},
@@ -3388,7 +3388,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640 | kFeaturesSCNDemo,
 		0, 0, 4
 	},
@@ -3410,7 +3410,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640 | kFeaturesSCNDemo,
 		0, 0, 5
 	},
@@ -3431,7 +3431,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640 | kFeaturesSCNDemo,
 		0, 0, 6
 	},
@@ -3449,7 +3449,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -3467,7 +3467,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -3485,7 +3485,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -3503,7 +3503,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -3521,7 +3521,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -3539,7 +3539,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -3557,7 +3557,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -3575,7 +3575,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -3593,7 +3593,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -3611,7 +3611,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -3647,7 +3647,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytnCk,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -3665,7 +3665,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytnCk,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -3683,7 +3683,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytnCk,
+		kGameTypePlaytoons,
 		kFeatures640,
 		"intro2.stk", 0, 0
 	},
@@ -4096,7 +4096,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		0, 0, 0
 	},
@@ -4110,7 +4110,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		0, 0, 0
 	},
@@ -4124,7 +4124,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		0, 0, 0
 	},
@@ -4138,7 +4138,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		0, 0, 0
 	},
@@ -4152,13 +4152,13 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytoon,
+		kGameTypePlaytoons,
 		kFeatures640,
 		0, 0, 0
 	},
 	{
 		{
-			"playtnck2",
+			"playtoons construction kit",
 			"unknown",
 			AD_ENTRY1(0, 0),
 			UNK_LANG,
@@ -4166,7 +4166,7 @@
 			ADGF_NO_FLAGS,
 			GUIO_NOSUBTITLES | GUIO_NOSPEECH
 		},
-		kGameTypePlaytnCk,
+		kGameTypePlaytoons,
 		kFeatures640,
 		0, 0, 0
 	},
@@ -4276,7 +4276,7 @@
 	{ &fallbackDescs[15], { "playtoon.stk", "chato.stk", 0 } },
 	{ &fallbackDescs[16], { "playtoon.stk", "manda.stk", 0 } },
 	{ &fallbackDescs[17], { "playtoon.stk", "wakan.stk", 0 } },
-	{ &fallbackDescs[18], { "playtoon.stk", 0 } },
+	{ &fallbackDescs[18], { "playtoon.stk", "dan.itk" } },
 	{ &fallbackDescs[19], { "intro.stk", "bambou.itk", 0 } },
 	{ &fallbackDescs[20], { "disk0.stk", "disk1.stk", "disk2.stk", "disk3.stk", 0 } },
 	{ &fallbackDescs[21], { "disk1.stk", "disk2.stk", "disk3.stk", 0 } },

Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp	2009-08-28 14:33:26 UTC (rev 43780)
+++ scummvm/trunk/engines/gob/gob.cpp	2009-08-28 18:14:55 UTC (rev 43781)
@@ -457,8 +457,7 @@
 		_saveLoad = new SaveLoad_v6(this, _targetName.c_str());
 		break;
 
-	case kGameTypePlaytoon:
-	case kGameTypePlaytnCk:
+	case kGameTypePlaytoons:
 	case kGameTypeBambou:
 		_init     = new Init_v2(this);
 		_video    = new Video_v6(this);

Modified: scummvm/trunk/engines/gob/gob.h
===================================================================
--- scummvm/trunk/engines/gob/gob.h	2009-08-28 14:33:26 UTC (rev 43780)
+++ scummvm/trunk/engines/gob/gob.h	2009-08-28 18:14:55 UTC (rev 43781)
@@ -101,8 +101,7 @@
 	kGameTypeInca2,
 	kGameTypeDynasty,
 	kGameTypeUrban,
-	kGameTypePlaytoon,
-	kGameTypePlaytnCk,
+	kGameTypePlaytoons,
 	kGameTypeBambou,
 	kGameTypeFascination,
 	kGameTypeGeisha,


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