[Scummvm-cvs-logs] SF.net SVN: scummvm:[49591] scummvm/trunk/engines/sci/engine
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Fri Jun 11 09:47:57 CEST 2010
Revision: 49591
http://scummvm.svn.sourceforge.net/scummvm/?rev=49591&view=rev
Author: thebluegr
Date: 2010-06-11 07:47:57 +0000 (Fri, 11 Jun 2010)
Log Message:
-----------
Added a new kernel function, kEmpty, for really empty (not dummy, i.e. unimplemented) functions
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kernel.cpp
scummvm/trunk/engines/sci/engine/kernel.h
scummvm/trunk/engines/sci/engine/kmisc.cpp
Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp 2010-06-11 02:50:25 UTC (rev 49590)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp 2010-06-11 07:47:57 UTC (rev 49591)
@@ -357,6 +357,7 @@
{ "TextColors", kTextColors, ".*" },
{ "TextFonts", kTextFonts, ".*" },
{ "Portrait", kPortrait, ".*" },
+ { "Empty", kEmpty, ".*" },
#ifdef ENABLE_SCI32
// SCI2 Kernel Functions
@@ -742,8 +743,8 @@
break;
case SCI_VERSION_1_1:
- // In SCI1.1, kSetSynonyms is a dummy (empty) function
- _kernelNames[0x26] = "Dummy";
+ // In SCI1.1, kSetSynonyms is an empty function
+ _kernelNames[0x26] = "Empty";
// In the Windows version of KQ6 CD, the empty kSetSynonyms
// function has been replaced with kPortrait. In KQ6 Mac,
Modified: scummvm/trunk/engines/sci/engine/kernel.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.h 2010-06-11 02:50:25 UTC (rev 49590)
+++ scummvm/trunk/engines/sci/engine/kernel.h 2010-06-11 07:47:57 UTC (rev 49591)
@@ -405,6 +405,7 @@
reg_t kPlatform(EngineState *s, int argc, reg_t *argv);
reg_t kTextColors(EngineState *s, int argc, reg_t *argv);
reg_t kTextFonts(EngineState *s, int argc, reg_t *argv);
+reg_t kEmpty(EngineState *s, int argc, reg_t *argv);
#ifdef ENABLE_SCI32
// SCI2 Kernel Functions
Modified: scummvm/trunk/engines/sci/engine/kmisc.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmisc.cpp 2010-06-11 02:50:25 UTC (rev 49590)
+++ scummvm/trunk/engines/sci/engine/kmisc.cpp 2010-06-11 07:47:57 UTC (rev 49591)
@@ -375,4 +375,12 @@
return NULL_REG;
}
+reg_t kEmpty(EngineState *s, int argc, reg_t *argv) {
+ // Placeholder for empty kernel functions which are still called from the engine
+ // scripts (like the empty kSetSynonyms function in SCI1.1). This differs from
+ // dummy functions because it does nothing and never throws a warning when it's
+ // called
+ return s->r_acc;
+}
+
} // End of namespace Sci
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