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

[thebluegr at users.sourceforge.net]

Revision: 51302
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51302&view=rev
Author:   thebluegr
Date:     2010-07-26 07:40:51 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
SCI: Fixed bug #3034536 - "AMIGAOS4: SCI - Compiler error".

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kernel_tables.h
    scummvm/trunk/engines/sci/resource.h

Modified: scummvm/trunk/engines/sci/engine/kernel_tables.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel_tables.h	2010-07-26 07:31:51 UTC (rev 51301)
+++ scummvm/trunk/engines/sci/engine/kernel_tables.h	2010-07-26 07:40:51 UTC (rev 51302)
@@ -305,7 +305,9 @@
     { MAP_CALL(AvoidPath),         SIG_EVERYWHERE,           "ii(.*)",                NULL,            NULL },
     { MAP_CALL(BaseSetter),        SIG_EVERYWHERE,           "o",                     NULL,            NULL },
     { MAP_CALL(CanBeHere),         SIG_EVERYWHERE,           "o(l)",                  NULL,            NULL },
+#ifdef ENABLE_SCI32
     { "CantBeHere", kCantBeHere32, SIG_SCI32, SIGFOR_ALL,    "ol",                    NULL,            NULL },
+#endif
     { MAP_CALL(CantBeHere),        SIG_EVERYWHERE,           "o(l)",                  NULL,            NULL },
     { MAP_CALL(CelHigh),           SIG_EVERYWHERE,           "ii(i)",                 NULL,            NULL },
     { MAP_CALL(CelWide),           SIG_EVERYWHERE,           "ii(i)",                 NULL,            NULL },

Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h	2010-07-26 07:31:51 UTC (rev 51301)
+++ scummvm/trunk/engines/sci/resource.h	2010-07-26 07:40:51 UTC (rev 51302)
@@ -149,11 +149,11 @@
 	Common::String toString() const {
 		char buf[32];
 
-		snprintf(buf, 32, "%s.%i", getResourceTypeName(_type), _number);
+		snprintf(buf, 32, "%s.%d", getResourceTypeName(_type), _number);
 		Common::String retStr = buf;
 
 		if (_tuple != 0) {
-			snprintf(buf, 32, "(%i, %i, %i, %i)", _tuple >> 24, (_tuple >> 16) & 0xff, (_tuple >> 8) & 0xff, _tuple & 0xff);
+			snprintf(buf, 32, "(%d, %d, %d, %d)", _tuple >> 24, (_tuple >> 16) & 0xff, (_tuple >> 8) & 0xff, _tuple & 0xff);
 			retStr += buf;
 		}
 


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