diff options
| author | Oliver Kiehl | 2002-11-27 15:08:24 +0000 |
|---|---|---|
| committer | Oliver Kiehl | 2002-11-27 15:08:24 +0000 |
| commit | e6883de2ff154fc5c7495bec5f7af5aeb42f94ce (patch) | |
| tree | 44822907bd5a8da003b0446ce9c5573ef4013f1f | |
| parent | 1afdb5c4bf2f6b8799449e7e3143bcc54715f4e6 (diff) | |
| download | scummvm-rg350-e6883de2ff154fc5c7495bec5f7af5aeb42f94ce.tar.gz scummvm-rg350-e6883de2ff154fc5c7495bec5f7af5aeb42f94ce.tar.bz2 scummvm-rg350-e6883de2ff154fc5c7495bec5f7af5aeb42f94ce.zip | |
moved game enum to intern.h
svn-id: r5728
| -rw-r--r-- | simon/intern.h | 15 | ||||
| -rw-r--r-- | simon/simon.h | 15 | ||||
| -rw-r--r-- | simon/simonsound.cpp | 15 |
3 files changed, 15 insertions, 30 deletions
diff --git a/simon/intern.h b/simon/intern.h index a2603709ea..8c6daec43e 100644 --- a/simon/intern.h +++ b/simon/intern.h @@ -135,4 +135,19 @@ struct GameSpecificSettings { const char *gamepc_filename; }; +enum { + GAME_SIMON2 = 1, + GAME_WIN = 2, + GAME_TALKIE = 4, + GAME_DEMO = 8, + + GAME_SIMON1DOS = 0, + GAME_SIMON2DOS = GAME_SIMON2, + GAME_SIMON1TALKIE = GAME_TALKIE, + GAME_SIMON2TALKIE = GAME_SIMON2 + GAME_TALKIE, + GAME_SIMON1WIN = GAME_WIN + GAME_TALKIE, + GAME_SIMON2WIN = GAME_SIMON2 + GAME_WIN + GAME_TALKIE, + GAME_SIMON1DEMO = GAME_DEMO, +}; + #endif diff --git a/simon/simon.h b/simon/simon.h index 09189678d8..52938daad5 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -106,21 +106,6 @@ public: byte _game; byte _key_pressed; - enum { - GAME_SIMON2 = 1, - GAME_WIN = 2, - GAME_TALKIE = 4, - GAME_DEMO = 8, - - GAME_SIMON1DOS = 0, - GAME_SIMON2DOS = GAME_SIMON2, - GAME_SIMON1TALKIE = GAME_TALKIE, - GAME_SIMON2TALKIE = GAME_SIMON2 + GAME_TALKIE, - GAME_SIMON1WIN = GAME_WIN + GAME_TALKIE, - GAME_SIMON2WIN = GAME_SIMON2 + GAME_WIN + GAME_TALKIE, - GAME_SIMON1DEMO = GAME_DEMO, - }; - typedef enum { FORMAT_NONE, FORMAT_MP3, diff --git a/simon/simonsound.cpp b/simon/simonsound.cpp index d5d406247c..854bed564f 100644 --- a/simon/simonsound.cpp +++ b/simon/simonsound.cpp @@ -21,21 +21,6 @@ #include "common/file.h" #include "common/engine.h" -enum { - GAME_SIMON2 = 1, - GAME_WIN = 2, - GAME_TALKIE = 4, - GAME_DEMO = 8, - - GAME_SIMON1DOS = 0, - GAME_SIMON2DOS = GAME_SIMON2, - GAME_SIMON1TALKIE = GAME_TALKIE, - GAME_SIMON2TALKIE = GAME_SIMON2 + GAME_TALKIE, - GAME_SIMON1WIN = GAME_WIN + GAME_TALKIE, - GAME_SIMON2WIN = GAME_SIMON2 + GAME_WIN + GAME_TALKIE, - GAME_SIMON1DEMO = GAME_DEMO, -}; - SimonSound::SimonSound(const byte game, const GameSpecificSettings *gss, const char *gameDataPath, SoundMixer *mixer) { _game = game; |