From b0b7764178bcb9fcf3fb590abd717c056894a66a Mon Sep 17 00:00:00 2001 From: Walter van Niftrik Date: Sun, 31 Jan 2010 22:38:07 +0000 Subject: SCI: Add stub for kIntersections() svn-id: r47784 --- engines/sci/engine/kernel.cpp | 7 ++++++- engines/sci/engine/kernel.h | 1 + engines/sci/engine/kpathing.cpp | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) (limited to 'engines/sci') diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp index 82171dc91d..1229ba6d08 100644 --- a/engines/sci/engine/kernel.cpp +++ b/engines/sci/engine/kernel.cpp @@ -149,7 +149,7 @@ static const char *sci_default_knames[SCI_KNAMES_DEFAULT_ENTRIES_NR] = { /*0x6e*/ "ShiftScreen", /*0x6f*/ "Palette", /*0x70*/ "MemorySegment", - /*0x71*/ "MoveCursor", + /*0x71*/ "Intersections", /*0x72*/ "Memory", /*0x73*/ "ListOps", /*0x74*/ "FileIO", @@ -325,6 +325,7 @@ SciKernelFunction kfunct_mappers[] = { DEFUN("DoAudio", kDoAudio, ".*"), DEFUN("DoSync", kDoSync, ".*"), DEFUN("MemorySegment", kMemorySegment, "iri*"), + DEFUN("Intersections", kIntersections, ".*"), DEFUN("ResCheck", kResCheck, "iii*"), DEFUN("SetQuitStr", kSetQuitStr, "r"), DEFUN("ShowMovie", kShowMovie, "..*"), @@ -762,6 +763,10 @@ void Kernel::setDefaultKernelNames(Common::String gameId) { _kernelNames.resize(0x79); break; + case SCI_VERSION_1_LATE: + _kernelNames[0x71] = "MoveCursor"; + break; + case SCI_VERSION_1_1: // In KQ6CD, the empty kSetSynonyms function has been replaced // with kPortrait diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index 06822f4b5b..bff7a7fe97 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -388,6 +388,7 @@ reg_t kMessage(EngineState *s, int argc, reg_t *argv); reg_t kDoAudio(EngineState *s, int argc, reg_t *argv); reg_t kDoSync(EngineState *s, int argc, reg_t *argv); reg_t kMemorySegment(EngineState *s, int argc, reg_t *argv); +reg_t kIntersections(EngineState *s, int argc, reg_t *argv); reg_t kResCheck(EngineState *s, int argc, reg_t *argv); reg_t kSetQuitStr(EngineState *s, int argc, reg_t *argv); reg_t kShowMovie(EngineState *s, int argc, reg_t *argv); diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp index a53450b237..86a0a67918 100644 --- a/engines/sci/engine/kpathing.cpp +++ b/engines/sci/engine/kpathing.cpp @@ -1454,4 +1454,9 @@ reg_t kAvoidPath(EngineState *s, int argc, reg_t *argv) { } } +reg_t kIntersections(EngineState *s, int argc, reg_t *argv) { + warning("Intersections() called"); + return NULL_REG; +} + } // End of namespace Sci -- cgit v1.2.3