[Scummvm-cvs-logs] CVS: scummvm/saga saga.cpp,1.39,1.40 saga.h,1.29,1.30
Eugene Sandulenko
sev at users.sourceforge.net
Wed Aug 4 11:09:40 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm NEWS,1.54.2.14,1.54.2.15
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga events.cpp,1.17,1.18 ihnm_introproc.cpp,1.13,1.14 ihnm_introproc.h,1.2,1.3 input.cpp,1.7,1.8 ite_introproc.cpp,1.17,1.18 ite_introproc.h,1.4,1.5 render.cpp,1.27,1.28 saga.cpp,1.40,1.41 saga.h,1.30,1.31 scene.cpp,1.25,1.26 scene.h,1.6,1.7 sdebug.cpp,1.13,1.14 sprite.cpp,1.17,1.18 scene_mod.h,1.7,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8830
Modified Files:
saga.cpp saga.h
Log Message:
Move state static variable to appropriate class
Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- saga.cpp 3 Aug 2004 01:07:34 -0000 1.39
+++ saga.cpp 4 Aug 2004 18:07:57 -0000 1.40
@@ -75,16 +75,9 @@
#define R_MAX_TIME_DELTA 100
-struct R_MAIN_DATA {
- int sound_enabled;
- int music_enabled;
-};
-
static void CF_quitfunc(int argc, char *argv[], void *refCon);
static void CF_testfunc(int argc, char *argv[], void *refCon);
-static R_MAIN_DATA MainData;
-
SagaEngine *_vm = NULL;
SagaEngine::SagaEngine(GameDetector *detector, OSystem *syst)
@@ -118,14 +111,14 @@
GAME_Register();
SCENE_Register();
- MainData.sound_enabled = 1;
- MainData.music_enabled = 1;
+ _soundEnabled = 1;
+ _musicEnabled = 1;
CVAR_RegisterFunc(CF_testfunc, "testfunc", "foo [ optional foo ]", R_CVAR_NONE, 0, -1, this);
- CVAR_Register_I(&MainData.sound_enabled, "sound", NULL, R_CVAR_CFG, 0, 1);
+ CVAR_Register_I(&_soundEnabled, "sound", NULL, R_CVAR_CFG, 0, 1);
- CVAR_Register_I(&MainData.music_enabled, "music", NULL, R_CVAR_CFG, 0, 1);
+ CVAR_Register_I(&_musicEnabled, "music", NULL, R_CVAR_CFG, 0, 1);
CVAR_RegisterFunc(CF_quitfunc, "quit", NULL, R_CVAR_NONE, 0, 0, this);
@@ -174,10 +167,10 @@
else if (ConfMan.getBool("native_mt32"))
driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
- _music = new Music(driver, MainData.music_enabled);
+ _music = new Music(driver, _musicEnabled);
_music->hasNativeMT32(ConfMan.getBool("native_mt32"));
- if (!MainData.music_enabled) {
+ if (!_musicEnabled) {
debug(0, "Music disabled.");
}
@@ -196,8 +189,8 @@
}
// Initialize system specific sound
- _sound = new Sound(this, _mixer, MainData.sound_enabled);
- if (!MainData.sound_enabled) {
+ _sound = new Sound(this, _mixer, _soundEnabled);
+ if (!_soundEnabled) {
debug(0, "Sound disabled.");
}
Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- saga.h 3 Aug 2004 01:07:34 -0000 1.29
+++ saga.h 4 Aug 2004 18:07:57 -0000 1.30
@@ -93,6 +93,9 @@
void shutdown();
+ int _soundEnabled;
+ int _musicEnabled;
+
SndRes *_sndRes;
Sound *_sound;
Music *_music;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm NEWS,1.54.2.14,1.54.2.15
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga events.cpp,1.17,1.18 ihnm_introproc.cpp,1.13,1.14 ihnm_introproc.h,1.2,1.3 input.cpp,1.7,1.8 ite_introproc.cpp,1.17,1.18 ite_introproc.h,1.4,1.5 render.cpp,1.27,1.28 saga.cpp,1.40,1.41 saga.h,1.30,1.31 scene.cpp,1.25,1.26 scene.h,1.6,1.7 sdebug.cpp,1.13,1.14 sprite.cpp,1.17,1.18 scene_mod.h,1.7,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list