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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Tue May 12 20:57:28 CEST 2009


Revision: 40499
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40499&view=rev
Author:   thebluegr
Date:     2009-05-12 18:57:28 +0000 (Tue, 12 May 2009)

Log Message:
-----------
Performed some cleanup on the different version checks

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/game.cpp
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/scicore/versions.h

Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp	2009-05-12 18:53:44 UTC (rev 40498)
+++ scummvm/trunk/engines/sci/engine/game.cpp	2009-05-12 18:57:28 UTC (rev 40499)
@@ -388,7 +388,7 @@
 
 	s->max_version = SCI_VERSION(9, 999, 999);
 	s->min_version = 0; //Set no real limits
-	s->version = SCI_VERSION_DEFAULT_SCI0;
+	s->version = 0;
 	s->kernel_opt_flags = 0;
 
 	if (!version) {

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-05-12 18:53:44 UTC (rev 40498)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-05-12 18:57:28 UTC (rev 40499)
@@ -1129,8 +1129,14 @@
 	if (lookup_selector(s, object, s->selector_map.brLeft, NULL, NULL) != kSelectorVariable)
 		return; // non-fatal
 
-	if (s->version <= SCI_VERSION_LTU_BASE_OB1)
+	// Note: there was a check here for a very old version of SCI, which supposedly needed
+	// to subtract 1 from absrect.top. The original check was for version 0.000.256, which
+	// does not exist (earliest one was KQ4 SCI, version 0.000.274). This code is left here
+	// for reference only
+#if 0
+	if (s->version <= SCI_VERSION(0,000,256))
 		--absrect.top; // Compensate for early SCI OB1 'bug'
+#endif
 
 	PUT_SEL32V(object, brLeft, absrect.left);
 	PUT_SEL32V(object, brRight, absrect.right);

Modified: scummvm/trunk/engines/sci/scicore/versions.h
===================================================================
--- scummvm/trunk/engines/sci/scicore/versions.h	2009-05-12 18:53:44 UTC (rev 40498)
+++ scummvm/trunk/engines/sci/scicore/versions.h	2009-05-12 18:57:28 UTC (rev 40499)
@@ -46,17 +46,6 @@
 ** - "FTU" means "First To Use"
 */
 
-#define SCI_VERSION_LAST_SCI0 SCI_VERSION(0,000,685)
-
-#define SCI_VERSION_DEFAULT_SCI0 SCI_VERSION_LAST_SCI0
-/* AFAIK this is the last published SCI0 version */
-#define SCI_VERSION_DEFAULT_SCI01 SCI_VERSION(1,000,72)
-/* The version used by my implementation of QfG2 */
-
-
-#define SCI_VERSION_FTU_CENTERED_TEXT_AS_DEFAULT SCI_VERSION(0,000,629)
-/* Last version known not to do this: 0.000.502 */
-
 #define SCI_VERSION_FTU_NEW_GETTIME SCI_VERSION(0,000,629)
 /* These versions of SCI has a different set of subfunctions in GetTime() */
 
@@ -79,11 +68,6 @@
 ** word header.
 */
 
-#define SCI_VERSION_LTU_BASE_OB1 SCI_VERSION(0,000,256)
-/* First version version known not to have this bug: ?
-** When doing CanBeHere(), augment y offset by 1
-*/
-
 #define SCI_VERSION_FTU_2ND_ANGLES SCI_VERSION(0,000,395)
 /* Last version known not to use this: ?
 ** Earlier versions assign 120 degrees to left & right , and 60 to up and down.


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