From 68f3cc944cbdcf6f5997700f996971087937a72e Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 22 Aug 2010 16:30:33 +0000 Subject: SCI: Reimplemented the kShow kernel command, used by the inbuilt SCI debugger. There is no real need to implement kernel debug commands, but since this one maps almost directly to our own "show" debug command, it has been reimplemented (was removed in rev #45310). Normally, there is no real need to implement kernel functions for debug functionality, since there are advanced tools for this purpose nowadays (plus, ScummVM's debugger). Fixes bug #3050616 - "QFG1 EGA: priority/control/view functions crash, debug mode" svn-id: r52281 --- engines/sci/engine/kernel.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/sci/engine/kernel.h') diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index b6247b46f1..dedc836b32 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -419,6 +419,7 @@ reg_t kStrSplit(EngineState *s, int argc, reg_t *argv); reg_t kPlatform(EngineState *s, int argc, reg_t *argv); reg_t kTextColors(EngineState *s, int argc, reg_t *argv); reg_t kTextFonts(EngineState *s, int argc, reg_t *argv); +reg_t kShow(EngineState *s, int argc, reg_t *argv); reg_t kDummy(EngineState *s, int argc, reg_t *argv); reg_t kEmpty(EngineState *s, int argc, reg_t *argv); reg_t kStub(EngineState *s, int argc, reg_t *argv); -- cgit v1.2.3 From c3c36cc59b46d9ef4e57bd58279a89dd8b8d5e4f Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Thu, 9 Sep 2010 11:40:46 +0000 Subject: SCI: SCI2/2.1 kernel table changes - Mark several SCI2/2.1 kernel functions used for debugging as dummy - Added an empty function for kSetWindowsOption, used for settings specific to Windows versions (e.g. showing/hiding the title bar) - Added a stub for kGetWindowsOption (currently returning 0 to a Windows related option for Phantasmagoria) svn-id: r52652 --- engines/sci/engine/kernel.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/sci/engine/kernel.h') diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index dedc836b32..4d8ed0bc0f 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -462,6 +462,7 @@ 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); reg_t kAddBefore(EngineState *s, int argc, reg_t *argv); reg_t kMoveToFront(EngineState *s, int argc, reg_t *argv); -- cgit v1.2.3 From 746a1c56144e0d4e608244ac19e6774fd4de3933 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Thu, 9 Sep 2010 15:09:26 +0000 Subject: SCI: Kernel table changes - Added the kernel names for all unimplemented kernel debug functions, and mapped them all to kDummy, so that the kernel tables are correct and all kernel functions are mapped (useful for debugging) - Added a stub for kWinHelp (normally opens an external Windows help file), with an appropriate dialog - Added a stub for kWinDLL, which currently errors out on purpose (this needs to be investigated, as it loads and uses external Windows DLLs) - Readded kListIndexOf in kList (the signature was wrong when the previous commit was made) svn-id: r52660 --- engines/sci/engine/kernel.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/sci/engine/kernel.h') diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index 4d8ed0bc0f..34d280d2ba 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -463,6 +463,8 @@ 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); +reg_t kWinHelp(EngineState *s, int argc, reg_t *argv); +reg_t kWinDLL(EngineState *s, int argc, reg_t *argv); reg_t kAddBefore(EngineState *s, int argc, reg_t *argv); reg_t kMoveToFront(EngineState *s, int argc, reg_t *argv); -- cgit v1.2.3 From a8afefd64b6707bb48684fcc1d62866a8772cf5e Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Thu, 9 Sep 2010 20:07:53 +0000 Subject: 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 --- engines/sci/engine/kernel.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'engines/sci/engine/kernel.h') 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); -- cgit v1.2.3 From f446dbc8d5e8cfa90dc90ea3034d9eb7b2252a84 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Thu, 9 Sep 2010 20:09:32 +0000 Subject: SCI: Implemented the kPrintDebug SCI2.1 kernel function, used in Shivers (demo) svn-id: r52665 --- engines/sci/engine/kernel.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/sci/engine/kernel.h') diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index 46da60082c..90b0ae2bee 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -461,13 +461,13 @@ reg_t kRobot(EngineState *s, int argc, reg_t *argv); reg_t kPlayVMD(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); -reg_t kWinHelp(EngineState *s, int argc, reg_t *argv); -reg_t kWinDLL(EngineState *s, int argc, reg_t *argv); - reg_t kAddBefore(EngineState *s, int argc, reg_t *argv); reg_t kMoveToFront(EngineState *s, int argc, reg_t *argv); reg_t kMoveToEnd(EngineState *s, int argc, reg_t *argv); +reg_t kGetWindowsOption(EngineState *s, int argc, reg_t *argv); +reg_t kWinHelp(EngineState *s, int argc, reg_t *argv); +reg_t kWinDLL(EngineState *s, int argc, reg_t *argv); +reg_t kPrintDebug(EngineState *s, int argc, reg_t *argv); #endif reg_t kDoSoundInit(EngineState *s, int argc, reg_t *argv); -- cgit v1.2.3 From 6cf1a4d537c5329778b0ad2234ba985e82e32ce8 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Wed, 15 Sep 2010 15:21:59 +0000 Subject: SCI: Some very early work on kRemapColors (just comments/observations for now) svn-id: r52733 --- engines/sci/engine/kernel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/sci/engine/kernel.h') diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index 90b0ae2bee..c42214dd01 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -278,7 +278,6 @@ private: /******************** Kernel functions ********************/ -// New kernel functions reg_t kStrLen(EngineState *s, int argc, reg_t *argv); reg_t kGetFarText(EngineState *s, int argc, reg_t *argv); reg_t kReadNumber(EngineState *s, int argc, reg_t *argv); @@ -420,6 +419,7 @@ reg_t kPlatform(EngineState *s, int argc, reg_t *argv); reg_t kTextColors(EngineState *s, int argc, reg_t *argv); reg_t kTextFonts(EngineState *s, int argc, reg_t *argv); reg_t kShow(EngineState *s, int argc, reg_t *argv); +reg_t kRemapColors(EngineState *s, int argc, reg_t *argv); reg_t kDummy(EngineState *s, int argc, reg_t *argv); reg_t kEmpty(EngineState *s, int argc, reg_t *argv); reg_t kStub(EngineState *s, int argc, reg_t *argv); -- cgit v1.2.3 From 8bf677716350c8a4c7b1009b9f97db56ca2e534f Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Fri, 17 Sep 2010 15:19:18 +0000 Subject: SCI2: some very early work on kSetShowStyle svn-id: r52764 --- engines/sci/engine/kernel.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/sci/engine/kernel.h') diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index c42214dd01..e50c6aaae2 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -444,6 +444,7 @@ reg_t kAddPlane(EngineState *s, int argc, reg_t *argv); reg_t kDeletePlane(EngineState *s, int argc, reg_t *argv); reg_t kUpdatePlane(EngineState *s, int argc, reg_t *argv); reg_t kRepaintPlane(EngineState *s, int argc, reg_t *argv); +reg_t kSetShowStyle(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 -- cgit v1.2.3