[Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.32,1.33 control.cpp,1.46,1.47 credits.cpp,1.8,1.9 music.cpp,1.36,1.37 music.h,1.15,1.16 sword1.cpp,1.80,1.81

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4479/sword1

Modified Files:
	animation.cpp control.cpp credits.cpp music.cpp music.h 
	sword1.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: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- animation.cpp	1 Jan 2005 16:20:17 -0000	1.32
+++ animation.cpp	10 Jan 2005 22:06:20 -0000	1.33
@@ -28,6 +28,7 @@
 
 #include "common/config-manager.h"
 #include "common/str.h"
+#include "common/system.h"
 
 namespace Sword1 {
 

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- control.cpp	1 Jan 2005 16:09:24 -0000	1.46
+++ control.cpp	10 Jan 2005 22:06:20 -0000	1.47
@@ -22,7 +22,7 @@
 #include "common/file.h"
 #include "common/stdafx.h"
 #include "common/util.h"
-#include "common/util.h"
+#include "common/system.h"
 
 #include "gui/message.h"
 

Index: credits.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/credits.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- credits.cpp	1 Jan 2005 16:09:24 -0000	1.8
+++ credits.cpp	10 Jan 2005 22:06:21 -0000	1.9
@@ -20,14 +20,18 @@
  */
 
 #include "stdafx.h"
+
 #include "sword1/credits.h"
 #include "sword1/screen.h"
-#include "common/file.h"
+#include "sword1/sword1.h"
+
+#include "sound/audiostream.h"
 #include "sound/mixer.h"
+
+#include "common/file.h"
 #include "common/util.h"
-#include "sound/audiostream.h"
+#include "common/system.h"
 
-#include "sword1.h"
 
 #define CREDITS_X 480
 #define CREDITS_Y 300

Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- music.cpp	9 Jan 2005 15:57:38 -0000	1.36
+++ music.cpp	10 Jan 2005 22:06:21 -0000	1.37
@@ -20,10 +20,14 @@
  */
 
 #include "stdafx.h"
+
 #include "sword1/music.h"
-#include "sound/mixer.h"
+
 #include "common/util.h"
 #include "common/file.h"
+#include "common/system.h"
+
+#include "sound/mixer.h"
 #include "sound/mp3.h"
 #include "sound/vorbis.h"
 #include "sound/wave.h"

Index: music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- music.h	1 Jan 2005 16:09:25 -0000	1.15
+++ music.h	10 Jan 2005 22:06:21 -0000	1.16
@@ -23,7 +23,7 @@
 #define BSMUSIC_H
 
 #include "scummsys.h"
-#include "common/system.h"
+#include "common/mutex.h"
 #include "common/file.h"
 #include "sound/audiostream.h"
 #include "sound/rate.h"
@@ -109,7 +109,7 @@
 	OSystem *_system;
 	SoundMixer *_mixer;
 	uint32 _sampleRate;
-	OSystem::MutexRef _mutex;
+	Common::MutexRef _mutex;
 
 	static void passMixerFunc(void *param, int16 *buf, uint len);
 	void mixer(int16 *buf, uint32 len);

Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- sword1.cpp	1 Jan 2005 16:09:25 -0000	1.80
+++ sword1.cpp	10 Jan 2005 22:06:21 -0000	1.81
@@ -28,6 +28,7 @@
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/timer.h"
+#include "common/system.h"
 
 #include "sword1/resman.h"
 #include "sword1/objectman.h"