diff options
author | Torbjörn Andersson | 2006-04-10 09:18:07 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2006-04-10 09:18:07 +0000 |
commit | f07d60adc81539421a5aecd5af425f597aaf478d (patch) | |
tree | d528a90e56a864c39d45a4127dfa62c3bed64624 /engines/simon/simon.h | |
parent | f1c79ee518f61ee0c8a2a1f9af9f2c0f1b7f5bf7 (diff) | |
download | scummvm-rg350-f07d60adc81539421a5aecd5af425f597aaf478d.tar.gz scummvm-rg350-f07d60adc81539421a5aecd5af425f597aaf478d.tar.bz2 scummvm-rg350-f07d60adc81539421a5aecd5af425f597aaf478d.zip |
By now, it should be obvious that I'm trying to get rid of the o_ functions.
This is in preparation for the next stage of the cleanup.
By now, I have merged most of the o_ opcode functions into the corresponding
o1_ opcode function. There are a few pure o_ opcode functions left, but it
makes sense to keep them separate functions since they are part of groups of
other functions. Now, to get rid of the remaining o_ functions I have:
Dropped the "o_" prefix from the following functions: o_kill_sprite_simon1(),
o_kill_sprite_simon2(), o_waitForSync(), o_freezeBottom(), o_setTextColor(),
o_fadeToBlack(), o_waitForMark(), o_unk_132_helper_3(), o_unk_132_helper(),
o_clearCharacter(), o_fileError().
Renamed o_sync() to sendSync().
Renamed o_mouseOn() to scriptMouseOn(), and moved it to items.cpp
Renamed o_mouseOff() to scriptMouseOff(), and moved it to items.cpp
svn-id: r21760
Diffstat (limited to 'engines/simon/simon.h')
-rw-r--r-- | engines/simon/simon.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/engines/simon/simon.h b/engines/simon/simon.h index c253618519..69622c198b 100644 --- a/engines/simon/simon.h +++ b/engines/simon/simon.h @@ -554,8 +554,8 @@ protected: void unlinkItem(Item *item); void linkItem(Item *item, Item *parent); - void o_kill_sprite_simon1(uint a); - void o_kill_sprite_simon2(uint a, uint b); + void kill_sprite_simon1(uint a); + void kill_sprite_simon2(uint a, uint b); void changeWindow(uint a); void closeWindow(uint a); @@ -571,18 +571,18 @@ protected: void hitarea_leave(HitArea * ha); void leaveHitAreaById(uint hitarea_id); - void o_waitForSync(uint a); + void waitForSync(uint a); void skipSpeech(); - void o_sync(uint a); - void o_freezeBottom(); + void sendSync(uint a); + void freezeBottom(); void killAllTimers(); uint getOffsetOfChild2Param(SubObject *child, uint prop); - void o_setTextColor(uint color); - void o_mouseOn(); - void o_mouseOff(); - void o_unfreezeBottom(); - void o_fadeToBlack(); + void setTextColor(uint color); + void scriptMouseOn(); + void scriptMouseOff(); + void unfreezeBottom(); + void fadeToBlack(); TextLocation *getTextLocation(uint a); void setup_cond_c_helper(); @@ -1080,7 +1080,7 @@ protected: void delay(uint delay); void pause(); - void o_waitForMark(uint i); + void waitForMark(uint i); void scrollEvent(); void decodeColumn(byte *dst, const byte *src, int height); @@ -1097,11 +1097,11 @@ protected: void set_volume(int volume); void saveOrLoadDialog(bool load); - void o_unk_132_helper_3(); - int o_unk_132_helper(bool *b, char *buf); - void o_clearCharacter(WindowBlock *window, int x, byte b = 0); + void unk_132_helper_3(); + int unk_132_helper(bool *b, char *buf); + void clearCharacter(WindowBlock *window, int x, byte b = 0); void saveGameDialog(char *buf); - void o_fileError(WindowBlock *window, bool save_error); + void fileError(WindowBlock *window, bool save_error); int countSaveGames(); int displaySaveGameList(int curpos, bool load, char *dst); |