aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Snover2017-05-23 21:14:31 -0500
committerColin Snover2017-05-27 23:36:11 -0500
commitccf5665fac6fe24510c17bcd492a5dcbe2c3d6d6 (patch)
treee44340405bc969c0d1bf06de5395a07dbfffbfdb
parent73fab1e135cfbf5f9d90a80940e4fb83f20c2609 (diff)
downloadscummvm-rg350-ccf5665fac6fe24510c17bcd492a5dcbe2c3d6d6.tar.gz
scummvm-rg350-ccf5665fac6fe24510c17bcd492a5dcbe2c3d6d6.tar.bz2
scummvm-rg350-ccf5665fac6fe24510c17bcd492a5dcbe2c3d6d6.zip
SCI32: Remove dead code
-rw-r--r--engines/sci/engine/kernel.cpp7
-rw-r--r--engines/sci/engine/kernel.h6
2 files changed, 0 insertions, 13 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 8a7cc78784..efa10c337c 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -35,9 +35,6 @@ namespace Sci {
Kernel::Kernel(ResourceManager *resMan, SegManager *segMan)
: _resMan(resMan), _segMan(segMan), _invalid("<invalid>") {
-#ifdef ENABLE_SCI32
- _kernelFunc_StringId = 0;
-#endif
}
Kernel::~Kernel() {
@@ -615,10 +612,6 @@ void Kernel::mapFunctions() {
}
#ifdef ENABLE_SCI32
- if (kernelName == "String") {
- _kernelFunc_StringId = id;
- }
-
// HACK: Phantasmagoria Mac uses a modified kDoSound (which *nothing*
// else seems to use)!
if (g_sci->getPlatform() == Common::kPlatformMacintosh && g_sci->getGameId() == GID_PHANTASMAGORIA && kernelName == "DoSound") {
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index dd75f26320..bddfab531f 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -183,12 +183,6 @@ public:
typedef Common::Array<KernelFunction> KernelFunctionArray;
KernelFunctionArray _kernelFuncs; /**< Table of kernel functions. */
-#ifdef ENABLE_SCI32
- // id of kString function, for quick usage in kArray
- // kArray calls kString in case parameters are strings
- uint16 _kernelFunc_StringId;
-#endif
-
/**
* Determines whether a list of registers matches a given signature.
* If no signature is given (i.e., if sig is NULL), this is always