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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Thu May 14 09:14:08 CEST 2009


Revision: 40549
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40549&view=rev
Author:   thebluegr
Date:     2009-05-14 07:14:08 +0000 (Thu, 14 May 2009)

Log Message:
-----------
Removed the hack used to check for the existence of the CantBeHere() selector

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kmovement.cpp
    scummvm/trunk/engines/sci/engine/state.h
    scummvm/trunk/engines/sci/sci.h
    scummvm/trunk/engines/sci/scicore/versions.h

Modified: scummvm/trunk/engines/sci/engine/kmovement.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmovement.cpp	2009-05-14 07:05:51 UTC (rev 40548)
+++ scummvm/trunk/engines/sci/engine/kmovement.cpp	2009-05-14 07:14:08 UTC (rev 40549)
@@ -359,7 +359,7 @@
 
 	SCIkdebug(SCIkBRESEN, "New data: (x,y)=(%d,%d), di=%d\n", x, y, bdi);
 
-	if (s->version >= SCI_VERSION_FTU_INVERSE_CANBEHERE)
+	if (s->selector_map.cantBeHere != -1)
 		invoke_selector(INV_SEL(client, cantBeHere, 0), 0);
 	else
 		invoke_selector(INV_SEL(client, canBeHere, 0), 0);

Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h	2009-05-14 07:05:51 UTC (rev 40548)
+++ scummvm/trunk/engines/sci/engine/state.h	2009-05-14 07:14:08 UTC (rev 40549)
@@ -285,7 +285,7 @@
 PaletteEntry get_pic_color(EngineState *s, int color);
 
 static inline reg_t not_register(EngineState *s, reg_t r) {
-	if (s->version >= SCI_VERSION_FTU_INVERSE_CANBEHERE)
+	if (s->selector_map.cantBeHere != -1)
 		return make_reg(0, !r.offset);
 	else
 		return r;

Modified: scummvm/trunk/engines/sci/sci.h
===================================================================
--- scummvm/trunk/engines/sci/sci.h	2009-05-14 07:05:51 UTC (rev 40548)
+++ scummvm/trunk/engines/sci/sci.h	2009-05-14 07:14:08 UTC (rev 40549)
@@ -127,7 +127,6 @@
 	GF_LOFSABSOLUTE		= (1 << 5),
 
 	/* Applies to all versions from 1.000.510 onwards
-    ** In later SCI1 versions, CanBeHere is called inversely.
 	** Also in kDisplay(), if the text would not fit on the screen, it
     ** is moved to the left and upwards until it fits.
 	** Finally, kDoSound() is different than in earlier SCI1 versions.

Modified: scummvm/trunk/engines/sci/scicore/versions.h
===================================================================
--- scummvm/trunk/engines/sci/scicore/versions.h	2009-05-14 07:05:51 UTC (rev 40548)
+++ scummvm/trunk/engines/sci/scicore/versions.h	2009-05-14 07:14:08 UTC (rev 40549)
@@ -88,11 +88,6 @@
    instructions is absolute rather than relative.
 */
 
-#define SCI_VERSION_FTU_INVERSE_CANBEHERE SCI_VERSION(1,000,510)
-/* FIXME: This shouldn't be a version number.
- * But it'll do for now.
- */
-
 #define SCI_VERSION_FTU_DISPLAY_COORDS_FUZZY SCI_VERSION(1,000,510)
 /* First version known to do this: ?
    In later versions of SCI1 kDisplay(), if the text would not fit on


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