[Scummvm-cvs-logs] CVS: scummvm/simon intern.h,1.4,1.5 simon.h,1.22,1.23 simonsound.cpp,1.5,1.6
Oliver Kiehl
olki at users.sourceforge.net
Wed Nov 27 07:09:02 CET 2002
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv32716
Modified Files:
intern.h simon.h simonsound.cpp
Log Message:
moved game enum to intern.h
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/intern.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- intern.h 30 Oct 2002 23:52:19 -0000 1.4
+++ intern.h 27 Nov 2002 15:08:24 -0000 1.5
@@ -135,4 +135,19 @@
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
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- simon.h 24 Nov 2002 15:26:19 -0000 1.22
+++ simon.h 27 Nov 2002 15:08:24 -0000 1.23
@@ -106,21 +106,6 @@
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,
Index: simonsound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simonsound.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- simonsound.cpp 26 Nov 2002 22:00:17 -0000 1.5
+++ simonsound.cpp 27 Nov 2002 15:08:24 -0000 1.6
@@ -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;
More information about the Scummvm-git-logs
mailing list