[Scummvm-cvs-logs] CVS: scummvm/common engine.h,1.32,1.33 engine.cpp,1.31,1.32
Max Horn
fingolfin at users.sourceforge.net
Tue Aug 5 16:59:03 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.313,2.314 imuse_player.cpp,2.15,2.16 imuse_internal.h,2.11,2.12 imuse.h,1.37,1.38 imuse.cpp,2.71,2.72
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.40,1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv27828/common
Modified Files:
engine.h engine.cpp
Log Message:
getting rid of g_mixer; removing lots of whitespace
Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/engine.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- engine.h 1 Aug 2003 12:18:35 -0000 1.32
+++ engine.h 5 Aug 2003 23:58:24 -0000 1.33
@@ -53,7 +53,6 @@
/* FIXME - BIG HACK for MidiEmu */
extern OSystem *g_system;
-extern SoundMixer *g_mixer;
class Engine {
public:
Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/engine.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- engine.cpp 5 Aug 2003 12:39:35 -0000 1.31
+++ engine.cpp 5 Aug 2003 23:58:24 -0000 1.32
@@ -73,7 +73,6 @@
/* FIXME - BIG HACK for MidiEmu */
OSystem *g_system = 0;
-SoundMixer *g_mixer = 0;
Engine *g_engine = 0;
Engine::Engine(GameDetector *detector, OSystem *syst)
@@ -83,9 +82,8 @@
_gameDataPath = detector->_gameDataPath;
- /* FIXME - BIG HACK for MidiEmu */
- g_system = _system;
- g_mixer = _mixer;
+ g_system = _system; // FIXME - BIG HACK for MidiEmu
+
_timer = new Timer(this);
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.313,2.314 imuse_player.cpp,2.15,2.16 imuse_internal.h,2.11,2.12 imuse.h,1.37,1.38 imuse.cpp,2.71,2.72
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.40,1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list