aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/kernel.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2010-05-28 10:45:20 +0000
committerFilippos Karapetis2010-05-28 10:45:20 +0000
commit967d9ea308342cbfb3c99904b5d6f1a0a3cd7ba0 (patch)
tree3cf014d93ac2add1650d4197fefb1def36de6c77 /engines/sci/engine/kernel.cpp
parentbea6ef4beb9ff55a848a76c2b33e32a9b3d9cdd9 (diff)
downloadscummvm-rg350-967d9ea308342cbfb3c99904b5d6f1a0a3cd7ba0.tar.gz
scummvm-rg350-967d9ea308342cbfb3c99904b5d6f1a0a3cd7ba0.tar.bz2
scummvm-rg350-967d9ea308342cbfb3c99904b5d6f1a0a3cd7ba0.zip
Added a stub for kMergePoly, to avoid crashing in QFG1VGA after killing a monster
svn-id: r49288
Diffstat (limited to 'engines/sci/engine/kernel.cpp')
-rw-r--r--engines/sci/engine/kernel.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 5527939950..50d79c432b 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -332,6 +332,7 @@ SciKernelFunction kfunct_mappers[] = {
DEFUN("DoSync", kDoSync, ".*"),
DEFUN("MemorySegment", kMemorySegment, "iri*"),
DEFUN("Intersections", kIntersections, "iiiiriiiri"),
+ DEFUN("MergePoly", kMergePoly, "rli"),
DEFUN("ResCheck", kResCheck, "iii*"),
DEFUN("SetQuitStr", kSetQuitStr, "r"),
DEFUN("ShowMovie", kShowMovie, ".*"),