[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

Max Horn fingolfin at users.sourceforge.net
Mon Jan 10 14:08:17 CET 2005


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

Modified Files:
	_mouse.cpp animation.cpp d_draw.cpp d_sound.cpp d_sound.h 
	menu.cpp palette.cpp rdwin.cpp render.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: _mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/_mouse.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- _mouse.cpp	1 Jan 2005 15:07:04 -0000	1.38
+++ _mouse.cpp	10 Jan 2005 22:06:33 -0000	1.39
@@ -18,6 +18,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/system.h"
 #include "sword2/sword2.h"
 #include "sword2/driver/d_draw.h"
 

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- animation.cpp	4 Jan 2005 15:31:30 -0000	1.48
+++ animation.cpp	10 Jan 2005 22:06:47 -0000	1.49
@@ -22,6 +22,7 @@
 #include "common/stdafx.h"
 #include "common/file.h"
 #include "common/config-manager.h"
+#include "common/system.h"
 #include "sound/vorbis.h"
 #include "sound/mp3.h"
 

Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_draw.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- d_draw.cpp	1 Jan 2005 15:07:04 -0000	1.63
+++ d_draw.cpp	10 Jan 2005 22:06:47 -0000	1.64
@@ -18,6 +18,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/system.h"
 #include "sword2/sword2.h"
 #include "sword2/driver/d_draw.h"
 #include "sword2/driver/menu.h"

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- d_sound.cpp	9 Jan 2005 15:57:38 -0000	1.134
+++ d_sound.cpp	10 Jan 2005 22:06:47 -0000	1.135
@@ -25,6 +25,7 @@
 
 #include "common/stdafx.h"
 #include "common/file.h"
+#include "common/system.h"
 #include "sound/mp3.h"
 #include "sound/vorbis.h"
 #include "sound/flac.h"

Index: d_sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- d_sound.h	1 Jan 2005 15:07:04 -0000	1.58
+++ d_sound.h	10 Jan 2005 22:06:48 -0000	1.59
@@ -59,7 +59,7 @@
 private:
 	Sword2Engine *_vm;
 
-	OSystem::MutexRef _mutex;
+	Common::MutexRef _mutex;
 
 	int32 _panTable[33];
 	bool _soundOn;

Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/menu.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- menu.cpp	1 Jan 2005 15:07:05 -0000	1.30
+++ menu.cpp	10 Jan 2005 22:06:48 -0000	1.31
@@ -55,10 +55,10 @@
 	static int32 lastTime = 0;
 
 	if (lastTime == 0) {
-		lastTime = _vm->_system->getMillis();
+		lastTime = _vm->getMillis();
 		frameCount = 1;
 	} else {
-		int32 delta = _vm->_system->getMillis() - lastTime;
+		int32 delta = _vm->getMillis() - lastTime;
 
 		if (delta > 250) {
 			lastTime += delta;

Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/palette.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- palette.cpp	1 Jan 2005 15:07:05 -0000	1.35
+++ palette.cpp	10 Jan 2005 22:06:49 -0000	1.36
@@ -18,6 +18,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/system.h"
 #include "sword2/sword2.h"
 #include "sword2/driver/d_draw.h"
 

Index: rdwin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/rdwin.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- rdwin.cpp	1 Jan 2005 15:07:05 -0000	1.49
+++ rdwin.cpp	10 Jan 2005 22:06:49 -0000	1.50
@@ -18,6 +18,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/system.h"
 #include "sword2/sword2.h"
 #include "sword2/driver/d_draw.h"
 #include "sword2/driver/menu.h"

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/render.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- render.cpp	1 Jan 2005 15:07:05 -0000	1.68
+++ render.cpp	10 Jan 2005 22:06:49 -0000	1.69
@@ -18,6 +18,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/system.h"
 #include "sword2/sword2.h"
 #include "sword2/driver/animation.h"
 #include "sword2/driver/d_draw.h"





More information about the Scummvm-git-logs mailing list