diff options
| author | Gregory Montoir | 2005-08-11 18:08:55 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2005-08-11 18:08:55 +0000 |
| commit | ea658702b5a11dfc77373594e5ce7579452b373d (patch) | |
| tree | c590b42db4a0fa5356b6d0d7a85b826c6e4514a2 | |
| parent | 91ad888d7c885ee6240f5a3f606f557aa8ee9b6b (diff) | |
| download | scummvm-rg350-ea658702b5a11dfc77373594e5ce7579452b373d.tar.gz scummvm-rg350-ea658702b5a11dfc77373594e5ce7579452b373d.tar.bz2 scummvm-rg350-ea658702b5a11dfc77373594e5ce7579452b373d.zip | |
get rid of game_thread_proc
svn-id: r18663
| -rw-r--r-- | simon/simon.cpp | 2 | ||||
| -rw-r--r-- | simon/simon.h | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index b62c67a5e1..1cabe29182 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -776,7 +776,7 @@ void SimonEngine::errorString(const char *buf1, char *buf2) { } } -void palette_fadeout(uint32 *pal_values, uint num) { +void SimonEngine::palette_fadeout(uint32 *pal_values, uint num) { byte *p = (byte *)pal_values; do { diff --git a/simon/simon.h b/simon/simon.h index 3a19714f77..a68fc4d849 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -387,6 +387,8 @@ protected: void readItemFromGamePc(Common::File *in, Item *item); void loadGamePcFile(const char *filename); + void palette_fadeout(uint32 *pal_values, uint num); + byte *allocateItem(uint size); byte *allocateTable(uint size); void alignTableMem(); @@ -739,8 +741,6 @@ protected: int go(); void openGameFile(); - static int CDECL game_thread_proc(void *param); - void timer_callback(); void timer_proc1(); @@ -818,8 +818,6 @@ protected: char *gen_savename(int slot); }; -void palette_fadeout(uint32 *pal_values, uint num); - } // End of namespace Simon #endif |