diff options
| author | Colin Snover | 2017-09-08 20:57:58 -0500 |
|---|---|---|
| committer | Colin Snover | 2017-09-08 21:10:51 -0500 |
| commit | 94b39c83b6e526d6907f6d524e97183a9e774248 (patch) | |
| tree | 8bac66f0864e05a0801a2dcc2f7bdba507185bea | |
| parent | 7eedfdbeaf2d1349a368ea308219f0f185322c0d (diff) | |
| download | scummvm-rg350-94b39c83b6e526d6907f6d524e97183a9e774248.tar.gz scummvm-rg350-94b39c83b6e526d6907f6d524e97183a9e774248.tar.bz2 scummvm-rg350-94b39c83b6e526d6907f6d524e97183a9e774248.zip | |
SCI32: Remove redundant kStringGetData implementation
This code is identical to the kArrayGetData implementation.
| -rw-r--r-- | engines/sci/engine/kernel.h | 1 | ||||
| -rw-r--r-- | engines/sci/engine/kernel_tables.h | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kstring.cpp | 8 |
3 files changed, 1 insertions, 10 deletions
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index baa891650e..a712474983 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -508,7 +508,6 @@ reg_t kStringNew(EngineState *s, int argc, reg_t *argv); reg_t kStringGetChar(EngineState *s, int argc, reg_t *argv); reg_t kStringFree(EngineState *s, int argc, reg_t *argv); reg_t kStringCompare(EngineState *s, int argc, reg_t *argv); -reg_t kStringGetData(EngineState *s, int argc, reg_t *argv); reg_t kStringLength(EngineState *s, int argc, reg_t *argv); reg_t kStringFormat(EngineState *s, int argc, reg_t *argv); reg_t kStringFormatAt(EngineState *s, int argc, reg_t *argv); diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h index 0f7b9cac6f..0a1b8002d9 100644 --- a/engines/sci/engine/kernel_tables.h +++ b/engines/sci/engine/kernel_tables.h @@ -541,7 +541,7 @@ static const SciKernelMapSubEntry kString_subops[] = { { SIG_SCI32, 7, MAP_CALL(StringCompare), "[0r][0r](i)", NULL }, { SIG_THRU_SCI21MID, 8, MAP_CALL(ArrayDuplicate), "r", NULL }, - { SIG_THRU_SCI21MID, 9, MAP_CALL(StringGetData), "[0or]", NULL }, + { SIG_THRU_SCI21MID, 9, MAP_CALL(ArrayGetData), "[0or]", NULL }, { SIG_THRU_SCI21MID, 10, MAP_CALL(StringLength), "[0r]", NULL }, { SIG_THRU_SCI21MID, 11, MAP_CALL(StringFormat), "[0ro](.*)", NULL }, { SIG_THRU_SCI21MID, 12, MAP_CALL(StringFormatAt), "r[0ro](.*)", NULL }, diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp index 5bab422425..cbe481d343 100644 --- a/engines/sci/engine/kstring.cpp +++ b/engines/sci/engine/kstring.cpp @@ -682,14 +682,6 @@ reg_t kStringCompare(EngineState *s, int argc, reg_t *argv) { return make_reg(0, (result > 0) - (result < 0)); } -reg_t kStringGetData(EngineState *s, int argc, reg_t *argv) { - if (s->_segMan->isObject(argv[0])) { - return readSelector(s->_segMan, argv[0], SELECTOR(data)); - } - - return argv[0]; -} - reg_t kStringLength(EngineState *s, int argc, reg_t *argv) { return make_reg(0, s->_segMan->getString(argv[0]).size()); } |