diff options
author | Martin Kiewitz | 2010-07-25 13:11:28 +0000 |
---|---|---|
committer | Martin Kiewitz | 2010-07-25 13:11:28 +0000 |
commit | 246a157d1ef05cceebbb29aa9f5380ea3c98564b (patch) | |
tree | d80b2569a5af0ddfd63a75da48fa0a69d709eefb /engines | |
parent | da5f1506e322a4c33067f6130cb5bc53367b477c (diff) | |
download | scummvm-rg350-246a157d1ef05cceebbb29aa9f5380ea3c98564b.tar.gz scummvm-rg350-246a157d1ef05cceebbb29aa9f5380ea3c98564b.tar.bz2 scummvm-rg350-246a157d1ef05cceebbb29aa9f5380ea3c98564b.zip |
SCI: adding separate kCantBeHere32 (stub)
svn-id: r51273
Diffstat (limited to 'engines')
-rw-r--r-- | engines/sci/engine/kernel.h | 1 | ||||
-rw-r--r-- | engines/sci/engine/kernel_tables.h | 1 | ||||
-rw-r--r-- | engines/sci/engine/kgraphics.cpp | 8 |
3 files changed, 10 insertions, 0 deletions
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index 19cf11affa..c3b07f4668 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -428,6 +428,7 @@ reg_t kArray(EngineState *s, int argc, reg_t *argv); reg_t kListAt(EngineState *s, int argc, reg_t *argv); reg_t kString(EngineState *s, int argc, reg_t *argv); reg_t kMulDiv(EngineState *s, int argc, reg_t *argv); +reg_t kCantBeHere32(EngineState *s, int argc, reg_t *argv); // "Screen items" in SCI32 are views reg_t kAddScreenItem(EngineState *s, int argc, reg_t *argv); reg_t kUpdateScreenItem(EngineState *s, int argc, reg_t *argv); diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h index c391898c46..56d697ffea 100644 --- a/engines/sci/engine/kernel_tables.h +++ b/engines/sci/engine/kernel_tables.h @@ -305,6 +305,7 @@ static SciKernelMapEntry s_kernelMap[] = { { MAP_CALL(AvoidPath), SIG_EVERYWHERE, "ii(.*)", NULL, NULL }, { MAP_CALL(BaseSetter), SIG_EVERYWHERE, "o", NULL, NULL }, { MAP_CALL(CanBeHere), SIG_EVERYWHERE, "o(l)", NULL, NULL }, + { "CantBeHere", kCantBeHere32, SIG_SCI32, SIGFOR_ALL, "ol", NULL, NULL }, { MAP_CALL(CantBeHere), SIG_EVERYWHERE, "o(l)", NULL, NULL }, { MAP_CALL(CelHigh), SIG_EVERYWHERE, "ii(i)", NULL, NULL }, { MAP_CALL(CelWide), SIG_EVERYWHERE, "ii(i)", NULL, NULL }, diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 4d3d73d0bb..a83c3986e1 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -1112,6 +1112,14 @@ reg_t kIsHiRes(EngineState *s, int argc, reg_t *argv) { return make_reg(0, 1); } +// SCI32 variant, can't work like sci16 variants +reg_t kCantBeHere32(EngineState *s, int argc, reg_t *argv) { +// reg_t curObject = argv[0]; +// reg_t listReference = (argc > 1) ? argv[1] : NULL_REG; + + return NULL_REG; +} + reg_t kAddScreenItem(EngineState *s, int argc, reg_t *argv) { reg_t viewObj = argv[0]; |