aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2005-06-20 12:17:22 +0000
committerEugene Sandulenko2005-06-20 12:17:22 +0000
commit75d868743c29de7d9c19dcc1b4099e6443dc8774 (patch)
treea314c2f6d98ea24a48ced22108691154ae1a5906
parentc613eaab8898ab6403cec5a5e9f352810634baf5 (diff)
downloadscummvm-rg350-75d868743c29de7d9c19dcc1b4099e6443dc8774.tar.gz
scummvm-rg350-75d868743c29de7d9c19dcc1b4099e6443dc8774.tar.bz2
scummvm-rg350-75d868743c29de7d9c19dcc1b4099e6443dc8774.zip
sfShowControls implementation is NOP
svn-id: r18417
-rw-r--r--saga/script.h2
-rw-r--r--saga/sfuncs.cpp10
2 files changed, 5 insertions, 7 deletions
diff --git a/saga/script.h b/saga/script.h
index 4e12131aa9..8393b653f3 100644
--- a/saga/script.h
+++ b/saga/script.h
@@ -529,7 +529,7 @@ private:
void sfPlayMusic(SCRIPTFUNC_PARAMS);
void SF_pickClimbOutPos(SCRIPTFUNC_PARAMS);
void SF_tossRif(SCRIPTFUNC_PARAMS);
- void SF_showControls(SCRIPTFUNC_PARAMS);
+ void sfShowControls(SCRIPTFUNC_PARAMS);
void SF_showMap(SCRIPTFUNC_PARAMS);
void sfPuzzleWon(SCRIPTFUNC_PARAMS);
void sfEnableEscape(SCRIPTFUNC_PARAMS);
diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp
index 8985a2d58c..107d315c3f 100644
--- a/saga/sfuncs.cpp
+++ b/saga/sfuncs.cpp
@@ -119,7 +119,7 @@ void Script::setupScriptFuncList(void) {
OPCODE(sfPlayMusic),
OPCODE(SF_pickClimbOutPos),
OPCODE(SF_tossRif),
- OPCODE(SF_showControls),
+ OPCODE(sfShowControls),
OPCODE(SF_showMap),
OPCODE(sfPuzzleWon),
OPCODE(sfEnableEscape),
@@ -1607,11 +1607,9 @@ void Script::SF_tossRif(SCRIPTFUNC_PARAMS) {
}
// Script function #66 (0x42)
-void Script::SF_showControls(SCRIPTFUNC_PARAMS) {
- for (int i = 0; i < nArgs; i++)
- thread->pop();
-
- error("STUB: SF_showControls(), %d args", nArgs);
+void Script::sfShowControls(SCRIPTFUNC_PARAMS) {
+ // It has zero implementation in Win rerelase, and in DOS
+ // release it deals with video ports.
}
// Script function #67 (0x43)