aboutsummaryrefslogtreecommitdiff
path: root/engines/sword1
diff options
context:
space:
mode:
authorFilippos Karapetis2009-09-24 10:15:50 +0000
committerFilippos Karapetis2009-09-24 10:15:50 +0000
commit6b79910bcb5d70a116a1ff2cc3e8b011734ecb70 (patch)
tree2f6d9047b07dba0d93170a4c99bd7d28167d313d /engines/sword1
parent16d7d9ba2375af7414fa95f9f9d3927e38e5b759 (diff)
downloadscummvm-rg350-6b79910bcb5d70a116a1ff2cc3e8b011734ecb70.tar.gz
scummvm-rg350-6b79910bcb5d70a116a1ff2cc3e8b011734ecb70.tar.bz2
scummvm-rg350-6b79910bcb5d70a116a1ff2cc3e8b011734ecb70.zip
Fixed some more warnings about unreachable code
svn-id: r44300
Diffstat (limited to 'engines/sword1')
-rw-r--r--engines/sword1/logic.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp
index be3797b0bd..769bf6d4c5 100644
--- a/engines/sword1/logic.cpp
+++ b/engines/sword1/logic.cpp
@@ -690,7 +690,7 @@ int Logic::interpretScript(Object *compact, int id, Header *scriptModule, int sc
break;
default:
error("Invalid operator %d",scriptCode[pc-1]);
- return 0;
+ //return 0;
}
}
}
@@ -1252,7 +1252,7 @@ int Logic::fnChangeSpeechText(Object *cpt, int32 id, int32 tar, int32 width, int
//The game is halted for debugging. Maybe we'll remove this later.
int Logic::fnTalkError(Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x) {
error("fnTalkError for id %d, instruction %d", id, cpt->o_down_flag);
- return SCRIPT_STOP;
+ //return SCRIPT_STOP;
}
int Logic::fnStartTalk(Object *cpt, int32 id, int32 target, int32 d, int32 e, int32 f, int32 z, int32 x) {
@@ -1607,7 +1607,7 @@ int Logic::fnStopMusic(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 d
int Logic::fnInnerSpace(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 d, int32 z, int32 x) {
error("fnInnerSpace() not working.");
- return SCRIPT_STOP;
+ //return SCRIPT_STOP;
}
int Logic::fnSetScreen(Object *cpt, int32 id, int32 target, int32 screen, int32 c, int32 d, int32 z, int32 x) {