aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-12-30 14:54:40 +0000
committerTorbjörn Andersson2004-12-30 14:54:40 +0000
commit1a27617a956d34acf50d7702fa4bb301107517e7 (patch)
tree124b7d254be9f04509a51890992178c2aeeeb55c
parent8ce71ebb2015320e81d4148d8136469d77f47c9c (diff)
downloadscummvm-rg350-1a27617a956d34acf50d7702fa4bb301107517e7.tar.gz
scummvm-rg350-1a27617a956d34acf50d7702fa4bb301107517e7.tar.bz2
scummvm-rg350-1a27617a956d34acf50d7702fa4bb301107517e7.zip
Renamed the "placard" opcode functions. They should be reasonably bug free
now. svn-id: r16387
-rw-r--r--saga/script.h4
-rw-r--r--saga/sfuncs.cpp8
2 files changed, 6 insertions, 6 deletions
diff --git a/saga/script.h b/saga/script.h
index 0808f7fb6b..1b1036bed6 100644
--- a/saga/script.h
+++ b/saga/script.h
@@ -353,8 +353,8 @@ private:
int SF_walkRelative(SCRIPTFUNC_PARAMS);
int SF_moveRelative(SCRIPTFUNC_PARAMS);
int SF_simulSpeech2(SCRIPTFUNC_PARAMS);
- int SF_placard(SCRIPTFUNC_PARAMS);
- int SF_placardOff(SCRIPTFUNC_PARAMS);
+ int sfPlacard(SCRIPTFUNC_PARAMS);
+ int sfPlacardOff(SCRIPTFUNC_PARAMS);
int SF_setProtagState(SCRIPTFUNC_PARAMS);
int sfResumeBgdAnim(SCRIPTFUNC_PARAMS);
int SF_throwActor(SCRIPTFUNC_PARAMS);
diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp
index e5a74aefea..55e0eae7ab 100644
--- a/saga/sfuncs.cpp
+++ b/saga/sfuncs.cpp
@@ -95,8 +95,8 @@ void Script::setupScriptFuncList(void) {
OPCODE(SF_walkRelative),
OPCODE(SF_moveRelative),
OPCODE(SF_simulSpeech2),
- OPCODE(SF_placard),
- OPCODE(SF_placardOff),
+ OPCODE(sfPlacard),
+ OPCODE(sfPlacardOff),
OPCODE(SF_setProtagState),
OPCODE(sfResumeBgdAnim),
OPCODE(SF_throwActor),
@@ -921,7 +921,7 @@ int Script::SF_simulSpeech2(SCRIPTFUNC_PARAMS) {
}
// Script function #48 (0x30)
-int Script::SF_placard(SCRIPTFUNC_PARAMS) {
+int Script::sfPlacard(SCRIPTFUNC_PARAMS) {
GAME_DISPLAYINFO disp_info;
SURFACE *back_buf = _vm->_gfx->getBackBuffer();
PALENTRY cur_pal[PAL_ENTRIES];
@@ -955,7 +955,7 @@ int Script::SF_placard(SCRIPTFUNC_PARAMS) {
}
// Script function #49 (0x31)
-int Script::SF_placardOff(SCRIPTFUNC_PARAMS) {
+int Script::sfPlacardOff(SCRIPTFUNC_PARAMS) {
SURFACE *back_buf = _vm->_gfx->getBackBuffer();
PALENTRY cur_pal[PAL_ENTRIES];
PALENTRY *pal;