aboutsummaryrefslogtreecommitdiff
path: root/sky
diff options
context:
space:
mode:
authorOliver Kiehl2003-05-24 23:17:12 +0000
committerOliver Kiehl2003-05-24 23:17:12 +0000
commit35b362495e75abaf28825ef9e3f19f7b00c2680c (patch)
treec1a39ad7133dedd3a1faa26381a4e29beafa9c9f /sky
parent0d2ddf238103a1bc8948900c75e77bf444414207 (diff)
downloadscummvm-rg350-35b362495e75abaf28825ef9e3f19f7b00c2680c.tar.gz
scummvm-rg350-35b362495e75abaf28825ef9e3f19f7b00c2680c.tar.bz2
scummvm-rg350-35b362495e75abaf28825ef9e3f19f7b00c2680c.zip
and a little bit more...
svn-id: r7913
Diffstat (limited to 'sky')
-rw-r--r--sky/logic.cpp13
-rw-r--r--sky/skydefs.h2
2 files changed, 11 insertions, 4 deletions
diff --git a/sky/logic.cpp b/sky/logic.cpp
index 71f60fd10c..c2a8ca3c2c 100644
--- a/sky/logic.cpp
+++ b/sky/logic.cpp
@@ -101,7 +101,8 @@ void SkyLogic::engine() {
}
void SkyLogic::lreturn() {
- error("lreturn: Is this really called?");
+ // WTF???
+ return;
}
void SkyLogic::logicScript() {
@@ -1102,7 +1103,9 @@ uint32 SkyLogic::fnArAnimate(uint32 a, uint32 b, uint32 c) {
}
uint32 SkyLogic::fnIdle(uint32 a, uint32 b, uint32 c) {
- error("Stub: fnIdle");
+ // set the player idling
+ _compact->logic = 0;
+ return 1;
}
uint32 SkyLogic::fnInteract(uint32 targetId, uint32 b, uint32 c) {
@@ -1271,7 +1274,8 @@ uint32 SkyLogic::fnSetStop(uint32 a, uint32 b, uint32 c) {
}
uint32 SkyLogic::fnClearStop(uint32 a, uint32 b, uint32 c) {
- error("Stub: fnClearStop");
+ _scriptVariables[MOUSE_STOP] = 0;
+ return 1;
}
uint32 SkyLogic::fnPointerText(uint32 a, uint32 b, uint32 c) {
@@ -1685,7 +1689,8 @@ uint32 SkyLogic::fnWaitSwingEnd(uint32 a, uint32 b, uint32 c) {
}
uint32 SkyLogic::fnSkipIntroCode(uint32 a, uint32 b, uint32 c) {
- error("Stub: fnSkipIntroCode");
+ warning("Stub: fnSkipIntroCode");
+ return 1;
}
uint32 SkyLogic::fnBlankScreen(uint32 a, uint32 b, uint32 c) {
diff --git a/sky/skydefs.h b/sky/skydefs.h
index 05d30fd942..4c5fdea43c 100644
--- a/sky/skydefs.h
+++ b/sky/skydefs.h
@@ -40,6 +40,8 @@
#define RESULT 0
#define LOGIC_LIST_NO 2
#define CUR_ID 12
+#define MOUSE_STATUS 13
+#define MOUSE_STOP 14
#define HIT_ID 37
#define THE_CHOSEN_ONE 51
#define TEXT1 53