diff options
| author | Eugene Sandulenko | 2004-10-20 22:38:24 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2004-10-20 22:38:24 +0000 |
| commit | e58a097acfd231f36eda89f76b385c7c13d58ded (patch) | |
| tree | ee08e85740a3df8025371098fd5d47764e6ecf85 /saga | |
| parent | daee7c19e53817e5e331286c2c595c8358dcd74a (diff) | |
| download | scummvm-rg350-e58a097acfd231f36eda89f76b385c7c13d58ded.tar.gz scummvm-rg350-e58a097acfd231f36eda89f76b385c7c13d58ded.tar.bz2 scummvm-rg350-e58a097acfd231f36eda89f76b385c7c13d58ded.zip | |
FX_CROWD constants are correct.
Add some simple stub.
svn-id: r15621
Diffstat (limited to 'saga')
| -rw-r--r-- | saga/resnames.h | 3 | ||||
| -rw-r--r-- | saga/script.h | 1 | ||||
| -rw-r--r-- | saga/sfuncs.cpp | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/saga/resnames.h b/saga/resnames.h index ec75d01e14..0d038d9a6e 100644 --- a/saga/resnames.h +++ b/saga/resnames.h @@ -154,8 +154,7 @@ namespace Saga { #define FX_JAIL_DOOR 54 #define FX_KILN_FIRE 55 -// TODO: These are only in the CD version, and I can't find them in the source -// code we got. Someone needs to verify these to get the correct values. +// These are only in the CD version #define FX_CROWD_01 56 #define FX_CROWD_02 57 diff --git a/saga/script.h b/saga/script.h index 1ca262d060..c5b666339e 100644 --- a/saga/script.h +++ b/saga/script.h @@ -274,6 +274,7 @@ private: int SF_getActorX(R_SCRIPTFUNC_PARAMS); int SF_getActorY(R_SCRIPTFUNC_PARAMS); int SF_playMusic(R_SCRIPTFUNC_PARAMS); + int SF_enableEscape(R_SCRIPTFUNC_PARAMS); int SF_playSound(R_SCRIPTFUNC_PARAMS); }; diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp index 9cbda863e8..84daf5b547 100644 --- a/saga/sfuncs.cpp +++ b/saga/sfuncs.cpp @@ -112,7 +112,7 @@ void Script::setupScriptFuncList(void) { {66, 0, NULL}, {67, 0, NULL}, {68, 0, NULL}, - {69, 0, NULL}, + {69, 1, OPCODE(SF_enableEscape)}, {70, 1, OPCODE(SF_playSound)}, {71, 0, NULL}, {72, 0, NULL}, @@ -733,6 +733,12 @@ int Script::SF_playMusic(R_SCRIPTFUNC_PARAMS) { return R_SUCCESS; } +// Script function #69 +int Script::SF_enableEscape(R_SCRIPTFUNC_PARAMS) { + thread->pop(); + return R_SUCCESS; +} + static struct { int res; int vol; |