[Scummvm-cvs-logs] CVS: scummvm/scumm cursor.cpp,2.18,2.19 music.h,2.11,2.12 player_v2a.h,2.9,2.10 player_v3a.h,1.19,1.20

Max Horn fingolfin at users.sourceforge.net
Tue Sep 28 16:55:46 CEST 2004


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

Modified Files:
	cursor.cpp music.h player_v2a.h player_v3a.h 
Log Message:
Removed some unneeded #includes

Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/cursor.cpp,v
retrieving revision 2.18
retrieving revision 2.19
diff -u -d -r2.18 -r2.19
--- cursor.cpp	21 Sep 2004 01:00:29 -0000	2.18
+++ cursor.cpp	28 Sep 2004 23:47:04 -0000	2.19
@@ -111,7 +111,8 @@
 
 void ScummEngine::updateCursor() {
 	_system->setMouseCursor(_grabbedCursor, _cursor.width, _cursor.height,
-							_cursor.hotspotX, _cursor.hotspotY);
+							_cursor.hotspotX, _cursor.hotspotY, 255, 
+							(_heversion == 70 ? 2 : 1));
 }
 
 void ScummEngine_v6::grabCursor(int x, int y, int w, int h) {

Index: music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/music.h,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -d -r2.11 -r2.12
--- music.h	6 Jan 2004 12:45:30 -0000	2.11
+++ music.h	28 Sep 2004 23:47:04 -0000	2.12
@@ -24,7 +24,6 @@
 #define SCUMM_MUSIC_H
 
 #include "common/scummsys.h"
-#include "common/system.h"
 
 namespace Scumm {
 

Index: player_v2a.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2a.h,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -d -r2.9 -r2.10
--- player_v2a.h	8 Jan 2004 20:37:25 -0000	2.9
+++ player_v2a.h	28 Sep 2004 23:47:04 -0000	2.10
@@ -24,10 +24,10 @@
 #define PLAYER_V2A_H
 
 #include "common/scummsys.h"
-#include "common/system.h"
 #include "scumm/music.h"
 #include "scumm/player_mod.h"
 
+class OSystem;
 class SoundMixer;
 
 namespace Scumm {

Index: player_v3a.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v3a.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- player_v3a.h	15 Feb 2004 08:06:32 -0000	1.19
+++ player_v3a.h	28 Sep 2004 23:47:04 -0000	1.20
@@ -24,10 +24,10 @@
 #define PLAYER_V3A_H
 
 #include "common/scummsys.h"
-#include "common/system.h"
 #include "scumm/music.h"
 #include "scumm/player_mod.h"
 
+class OSystem;
 class SoundMixer;
 
 namespace Scumm {





More information about the Scummvm-git-logs mailing list