[Scummvm-cvs-logs] SF.net SVN: scummvm:[50829] scummvm/trunk/engines/sci

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Mon Jul 12 21:55:42 CEST 2010


Revision: 50829
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50829&view=rev
Author:   m_kiewitz
Date:     2010-07-12 19:55:42 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
SCI: changing gameid of lsl6 sci2.1 into "lsl6hires". We need to keep workarounds etc. separate, scripts are not compatible

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

Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp	2010-07-12 19:41:26 UTC (rev 50828)
+++ scummvm/trunk/engines/sci/detection.cpp	2010-07-12 19:55:42 UTC (rev 50829)
@@ -105,6 +105,7 @@
 	// TODO: Inside The Chest/Behind the Developer's Shield
 	{"kq7",             "King's Quest VII: The Princeless Bride"},
 	// TODO: King's Questions
+	{"lsl6hires",       "Leisure Suit Larry 6: Shape Up or Slip Out!"},
 	{"phantasmagoria",  "Phantasmagoria"},
 	{"pqswat",          "Police Quest: SWAT"},
 	{"shivers",         "Shivers"},
@@ -164,6 +165,7 @@
 	{ "lsl3",            GID_LSL3 },
 	{ "lsl5",            GID_LSL5 },
 	{ "lsl6",            GID_LSL6 },
+	{ "lsl6hires",       GID_LSL6HIRES },
 	{ "lsl7",            GID_LSL7 },
 	{ "mothergoose",     GID_MOTHERGOOSE },
 	{ "msastrochicken",  GID_MSASTROCHICKEN },

Modified: scummvm/trunk/engines/sci/detection_tables.h
===================================================================
--- scummvm/trunk/engines/sci/detection_tables.h	2010-07-12 19:41:26 UTC (rev 50828)
+++ scummvm/trunk/engines/sci/detection_tables.h	2010-07-12 19:55:42 UTC (rev 50829)
@@ -1684,7 +1684,7 @@
 #ifdef ENABLE_SCI32
 	// Larry 6 - English/German DOS CD - HIRES
 	// SCI interpreter version 2.100.002
-	{"lsl6", "", {
+	{"lsl6hires", "", {
 		{"resource.map", 0, "0c0804434ea62278dd15032b1947426c", 8872},
 		{"resource.000", 0, "9a9f4870504444cda863dd14d077a680", 18520872},
 		{NULL, 0, NULL, 0}},
@@ -1692,7 +1692,7 @@
 
 	// Larry 6 - German DOS CD - HIRES (provided by richiefs in bug report #2670691)
 	// SCI interpreter version 2.100.002
-	{"lsl6", "", {
+	{"lsl6hires", "", {
 		{"resource.map", 0, "badfdf446ffed569a310d2c63a249421", 8896},
 		{"resource.000", 0, "bd944d2b06614a5b39f1586906f0ee88", 18534274},
 		{NULL, 0, NULL, 0}},
@@ -1700,7 +1700,7 @@
 
 	// Larry 6 - French DOS CD - HIRES (provided by richiefs in bug report #2670691)
 	// SCI interpreter version 2.100.002
-	{"lsl6", "", {
+	{"lsl6hires", "", {
 		{"resource.map", 0, "d184e9aa4f2d4b5670ddb3669db82cda", 8896},
 		{"resource.000", 0, "bd944d2b06614a5b39f1586906f0ee88", 18538987},
 		{NULL, 0, NULL, 0}},

Modified: scummvm/trunk/engines/sci/sci.h
===================================================================
--- scummvm/trunk/engines/sci/sci.h	2010-07-12 19:41:26 UTC (rev 50828)
+++ scummvm/trunk/engines/sci/sci.h	2010-07-12 19:55:42 UTC (rev 50829)
@@ -139,6 +139,7 @@
 	GID_LSL3,
 	GID_LSL5,
 	GID_LSL6,
+	GID_LSL6HIRES, // We have a separate ID for LSL6 SCI32, because it's actually a completely different game
 	GID_LSL7,
 	GID_MOTHERGOOSE,
 	GID_MSASTROCHICKEN,


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




More information about the Scummvm-git-logs mailing list