[Scummvm-cvs-logs] CVS: scummvm/simon cursor.cpp,1.4,1.5 items.cpp,1.115,1.116 midi.h,1.26,1.27 saveload.cpp,1.4,1.5 simon.cpp,1.481,1.482 vga.cpp,1.120,1.121
Max Horn
fingolfin at users.sourceforge.net
Mon Jan 10 14:09:06 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver _mouse.cpp,1.38,1.39 animation.cpp,1.48,1.49 d_draw.cpp,1.63,1.64 d_sound.cpp,1.134,1.135 d_sound.h,1.58,1.59 menu.cpp,1.30,1.31 palette.cpp,1.35,1.36 rdwin.cpp,1.49,1.50 render.cpp,1.68,1.69
- Next message: [Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.98,1.99 main.cpp,1.68,1.69
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4479/simon
Modified Files:
cursor.cpp items.cpp midi.h saveload.cpp simon.cpp vga.cpp
Log Message:
system.h was being included in tons of places, without any good reason; reduced this (total dependencies on system.h went down from 193 to 85 files)
Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/cursor.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cursor.cpp 1 Jan 2005 16:09:19 -0000 1.4
+++ cursor.cpp 10 Jan 2005 22:06:12 -0000 1.5
@@ -23,6 +23,7 @@
#include "simon/simon.h"
#include "simon/intern.h"
+#include "common/system.h"
namespace Simon {
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- items.cpp 1 Jan 2005 16:09:19 -0000 1.115
+++ items.cpp 10 Jan 2005 22:06:12 -0000 1.116
@@ -26,6 +26,8 @@
#include "simon/simon.h"
#include "simon/intern.h"
+#include "common/system.h"
+
namespace Simon {
int SimonEngine::runScript() {
Index: midi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- midi.h 1 Jan 2005 16:09:19 -0000 1.26
+++ midi.h 10 Jan 2005 22:06:13 -0000 1.27
@@ -24,6 +24,7 @@
#include "sound/mididrv.h"
#include "sound/midiparser.h"
+#include "common/mutex.h"
class File;
class OSystem;
@@ -52,7 +53,7 @@
class MidiPlayer : public MidiDriver {
protected:
OSystem *_system;
- OSystem::MutexRef _mutex;
+ Common::MutexRef _mutex;
MidiDriver *_driver;
bool _map_mt32_to_gm;
bool _passThrough;
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/saveload.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- saveload.cpp 1 Jan 2005 16:09:19 -0000 1.4
+++ saveload.cpp 10 Jan 2005 22:06:13 -0000 1.5
@@ -34,6 +34,9 @@
#include "simon/simon.h"
#include "simon/intern.h"
+#include "common/savefile.h"
+#include "common/system.h"
+
namespace Simon {
void SimonEngine::o_save_game() {
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -d -r1.481 -r1.482
--- simon.cpp 1 Jan 2005 16:09:19 -0000 1.481
+++ simon.cpp 10 Jan 2005 22:06:13 -0000 1.482
@@ -29,6 +29,7 @@
#include "common/config-manager.h"
#include "common/file.h"
#include "common/md5.h"
+#include "common/system.h"
#include "gui/about.h"
#include "gui/message.h"
Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- vga.cpp 1 Jan 2005 16:09:20 -0000 1.120
+++ vga.cpp 10 Jan 2005 22:06:15 -0000 1.121
@@ -25,6 +25,8 @@
#include "simon/intern.h"
#include "simon/vga.h"
+#include "common/system.h"
+
namespace Simon {
typedef void (SimonEngine::*VgaOpcodeProc) ();
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver _mouse.cpp,1.38,1.39 animation.cpp,1.48,1.49 d_draw.cpp,1.63,1.64 d_sound.cpp,1.134,1.135 d_sound.h,1.58,1.59 menu.cpp,1.30,1.31 palette.cpp,1.35,1.36 rdwin.cpp,1.49,1.50 render.cpp,1.68,1.69
- Next message: [Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.98,1.99 main.cpp,1.68,1.69
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list