[Scummvm-cvs-logs] CVS: scummvm main.cpp,1.22,1.23 scumm.h,1.164,1.165 scummvm.cpp,1.155,1.156
Nicolas Bacca
arisme at users.sourceforge.net
Sat May 18 13:13:05 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv9895
Modified Files:
main.cpp scumm.h scummvm.cpp
Log Message:
Big ugly hairy hack to remove Scumm class dependencies to the MidiEmu driver, and add streaming (ahah) emulation - someone please fix this as soon as possible :)
Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/main.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- main.cpp 14 May 2002 19:51:52 -0000 1.22
+++ main.cpp 18 May 2002 20:12:41 -0000 1.23
@@ -32,6 +32,9 @@
Gui gui;
Scumm *g_scumm;
+/* FIXME */
+OSystem *g_system;
+SoundMixer *g_mixer;
Config * scummcfg;
@@ -182,6 +185,8 @@
MidiDriver *midi = detector.createMidi();
SimonState *simon = SimonState::create(system, midi);
+ g_system = simon->_system;
+ g_mixer = &simon->_mixer[0];
simon->_game = detector._gameId - GID_SIMON_FIRST;
simon->set_volume(detector._sfx_volume);
simon->_game_path = detector._gameDataPath;
@@ -190,6 +195,8 @@
} else {
Scumm *scumm = Scumm::createFromDetector(&detector, system);
g_scumm = scumm;
+ g_system = scumm->_system;
+ g_mixer = &scumm->_mixer[0];
g_scumm->_sound_volume_master = 0;
g_scumm->_sound_volume_music = detector._music_volume;
g_scumm->_sound_volume_sfx = detector._sfx_volume;
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- scumm.h 14 May 2002 23:50:09 -0000 1.164
+++ scumm.h 18 May 2002 20:12:41 -0000 1.165
@@ -45,6 +45,9 @@
/* Use this one from error() ONLY */
extern Scumm *g_scumm;
+/* BIG HACK for MidiEmu - FIXME */
+extern OSystem *g_system;
+extern SoundMixer *g_mixer;
/* System Wide Constants */
enum {
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- scummvm.cpp 15 May 2002 10:25:00 -0000 1.155
+++ scummvm.cpp 18 May 2002 20:12:41 -0000 1.156
@@ -1425,6 +1425,8 @@
/* HACK !!! */
g_scumm = scumm;
+ g_system = scumm->_system;
+ g_mixer = &scumm->_mixer[0];
/* END HACK */
// scumm->_fullScreen = detector->_fullScreen;
More information about the Scummvm-git-logs
mailing list