[Scummvm-cvs-logs] CVS: residual debug.cpp,1.10,1.11 font.cpp,1.4,1.5 lipsynch.cpp,1.7,1.8 material.h,1.10,1.11 model.cpp,1.29,1.30 primitives.cpp,1.5,1.6 primitives.h,1.5,1.6 scene.cpp,1.47,1.48 scene.h,1.31,1.32 textobject.h,1.16,1.17 walkplane.h,1.14,1.15 lua.cpp,1.166,1.167

[Marcus Comstedt]

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

Modified Files:
	debug.cpp font.cpp lipsynch.cpp material.h model.cpp 
	primitives.cpp primitives.h scene.cpp scene.h textobject.h 
	walkplane.h lua.cpp 
Log Message:
Removed includes of SDL stuff in code not depending on SDL (and added such includes in code which _is_ depending on SDL...)

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/debug.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- debug.cpp	12 Aug 2005 12:05:18 -0000	1.10
+++ debug.cpp	5 Feb 2006 16:11:11 -0000	1.11
@@ -21,7 +21,6 @@
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
-#include <SDL.h>
 
 const char *tag2str(uint32 tag) {
 	static char str[5];

Index: font.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/font.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- font.cpp	17 Jul 2005 23:40:21 -0000	1.4
+++ font.cpp	5 Feb 2006 16:11:11 -0000	1.5
@@ -22,7 +22,6 @@
 #include "driver.h"
 
 #include <cstring>
-#include <SDL_endian.h>
 
 Font::Font(const char *filename, const char *data, int /*len*/) :
 	Resource(filename) {

Index: lipsynch.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lipsynch.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- lipsynch.cpp	21 Jan 2005 20:34:41 -0000	1.7
+++ lipsynch.cpp	5 Feb 2006 16:11:11 -0000	1.8
@@ -21,7 +21,6 @@
 #include "lipsynch.h"
 
 #include <cstring>
-#include <SDL_endian.h>
 
 // A new define that'll be around when theres a configure script :)
 #undef DEBUG_VERBOSE

Index: material.h
===================================================================
RCS file: /cvsroot/scummvm/residual/material.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- material.h	10 Jul 2005 18:57:27 -0000	1.10
+++ material.h	5 Feb 2006 16:11:11 -0000	1.11
@@ -21,8 +21,6 @@
 #include "resource.h"
 
 #include <cstring>
-#include <SDL.h>
-#include "tinygl/gl.h"
 
 class CMap;
 

Index: model.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/model.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- model.cpp	21 Jul 2005 15:16:35 -0000	1.29
+++ model.cpp	5 Feb 2006 16:11:11 -0000	1.30
@@ -25,7 +25,6 @@
 #include "driver.h"
 
 #include <cstring>
-#include <SDL.h>
 
 Model::Model(const char *filename, const char *data, int len, const CMap &cmap) :
 	Resource(filename), _numMaterials(0), _numGeosets(0) {

Index: primitives.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/primitives.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- primitives.cpp	10 Aug 2005 08:33:45 -0000	1.5
+++ primitives.cpp	5 Feb 2006 16:11:11 -0000	1.6
@@ -23,7 +23,6 @@
 #include "primitives.h"
 
 #include <string>
-#include <SDL.h>
 
 PrimitiveObject::PrimitiveObject() {
 	_x1 = 0;

Index: primitives.h
===================================================================
RCS file: /cvsroot/scummvm/residual/primitives.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- primitives.h	5 May 2005 21:27:31 -0000	1.5
+++ primitives.h	5 Feb 2006 16:11:11 -0000	1.6
@@ -25,7 +25,6 @@
 #include "driver.h"
 
 #include <string>
-#include <SDL.h>
 
 class PrimitiveObject {
 public:

Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/scene.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- scene.cpp	28 Dec 2005 05:22:18 -0000	1.47
+++ scene.cpp	5 Feb 2006 16:11:11 -0000	1.48
@@ -28,7 +28,6 @@
 
 #include "imuse/imuse.h"
 
-#include <SDL.h>
 #include <cmath>
 
 Scene::Scene(const char *name, const char *buf, int len) :

Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/residual/scene.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- scene.h	27 Aug 2005 16:08:44 -0000	1.31
+++ scene.h	5 Feb 2006 16:11:11 -0000	1.32
@@ -25,8 +25,6 @@
 #include "walkplane.h"
 #include "objectstate.h"
 
-#include <SDL.h>
-#include "tinygl/gl.h"
 #include <string>
 
 class CMap;

Index: textobject.h
===================================================================
RCS file: /cvsroot/scummvm/residual/textobject.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- textobject.h	21 Aug 2005 13:37:06 -0000	1.16
+++ textobject.h	5 Feb 2006 16:11:11 -0000	1.17
@@ -24,7 +24,6 @@
 #include "driver.h"
 
 #include <string>
-#include <SDL.h>
 
 struct TextObjectDefaults {
 	Color fgColor;

Index: walkplane.h
===================================================================
RCS file: /cvsroot/scummvm/residual/walkplane.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- walkplane.h	28 Dec 2005 05:22:18 -0000	1.14
+++ walkplane.h	5 Feb 2006 16:11:11 -0000	1.15
@@ -22,9 +22,6 @@
 #include "vector3d.h"
 
 #include <string>
-#include <SDL.h>
-
-#include "tinygl/gl.h"
 
 class TextSplitter;
 

Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- lua.cpp	5 Jan 2006 12:01:14 -0000	1.166
+++ lua.cpp	5 Feb 2006 16:11:11 -0000	1.167
@@ -39,6 +39,7 @@
 #include <cmath>
 #include <SDL_keysym.h>
 #include <SDL_keyboard.h>
+#include <SDL_events.h>
 #include <zlib.h>
 
 extern Imuse *g_imuse;