diff options
| author | Martin Kiewitz | 2010-09-09 20:07:53 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-09-09 20:07:53 +0000 |
| commit | a8afefd64b6707bb48684fcc1d62866a8772cf5e (patch) | |
| tree | de79795afedd8dfc92531624388ab8a046cc3e00 /engines/sci/engine/kernel.h | |
| parent | 61adb401b2e7f515067b5a4561b222a82fc604b8 (diff) | |
| download | scummvm-rg350-a8afefd64b6707bb48684fcc1d62866a8772cf5e.tar.gz scummvm-rg350-a8afefd64b6707bb48684fcc1d62866a8772cf5e.tar.bz2 scummvm-rg350-a8afefd64b6707bb48684fcc1d62866a8772cf5e.zip | |
SCI: kIsOnMe is kOnMe, merge both into kIsOnMe
and map kOnMe for SCI2 to kIsOnMe, remove commented out hacks. fix signatures for those 2 functions, added TODO - someone should fix the SCI32 signatures
svn-id: r52664
Diffstat (limited to 'engines/sci/engine/kernel.h')
| -rw-r--r-- | engines/sci/engine/kernel.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index 34d280d2ba..46da60082c 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -446,11 +446,11 @@ reg_t kUpdatePlane(EngineState *s, int argc, reg_t *argv); reg_t kRepaintPlane(EngineState *s, int argc, reg_t *argv); reg_t kGetHighPlanePri(EngineState *s, int argc, reg_t *argv); reg_t kFrameOut(EngineState *s, int argc, reg_t *argv); +reg_t kIsOnMe(EngineState *s, int argc, reg_t *argv); // kOnMe for SCI2, kIsOnMe for SCI2.1 reg_t kListIndexOf(EngineState *s, int argc, reg_t *argv); reg_t kListEachElementDo(EngineState *s, int argc, reg_t *argv); reg_t kListFirstTrue(EngineState *s, int argc, reg_t *argv); reg_t kListAllTrue(EngineState *s, int argc, reg_t *argv); -reg_t kOnMe(EngineState *s, int argc, reg_t *argv); reg_t kInPolygon(EngineState *s, int argc, reg_t *argv); // SCI2.1 Kernel Functions @@ -459,7 +459,6 @@ reg_t kSave(EngineState *s, int argc, reg_t *argv); reg_t kList(EngineState *s, int argc, reg_t *argv); reg_t kRobot(EngineState *s, int argc, reg_t *argv); reg_t kPlayVMD(EngineState *s, int argc, reg_t *argv); -reg_t kIsOnMe(EngineState *s, int argc, reg_t *argv); reg_t kCD(EngineState *s, int argc, reg_t *argv); reg_t kAddPicAt(EngineState *s, int argc, reg_t *argv); reg_t kGetWindowsOption(EngineState *s, int argc, reg_t *argv); |