[Scummvm-cvs-logs] CVS: scummvm/sword2 anims.cpp,1.53,1.54 build_display.cpp,1.53,1.54 console.cpp,1.39,1.40 controls.cpp,1.61,1.62 debug.cpp,1.34,1.35 events.cpp,1.25,1.26 function.cpp,1.55,1.56 icons.cpp,1.32,1.33 interpreter.cpp,1.39,1.40 layers.cpp,1.24,1.25 logic.cpp,1.40,1.41 maketext.cpp,1.37,1.38 mem_view.cpp,1.25,1.26 memory.cpp,1.22,1.23 mouse.cpp,1.52,1.53 protocol.cpp,1.24,1.25 resman.cpp,1.86,1.87 router.cpp,1.39,1.40 save_rest.cpp,1.47,1.48 scroll.cpp,1.16,1.17 sound.cpp,1.39,1.40 speech.cpp,1.57,1.58 startup.cpp,1.38,1.39 sword2.cpp,1.103,1.104 sword2.h,1.49,1.50 sync.cpp,1.17,1.18 walker.cpp,1.34,1.35

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Thu Feb 5 06:24:17 CET 2004


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

Modified Files:
	anims.cpp build_display.cpp console.cpp controls.cpp debug.cpp 
	events.cpp function.cpp icons.cpp interpreter.cpp layers.cpp 
	logic.cpp maketext.cpp mem_view.cpp memory.cpp mouse.cpp 
	protocol.cpp resman.cpp router.cpp save_rest.cpp scroll.cpp 
	sound.cpp speech.cpp startup.cpp sword2.cpp sword2.h sync.cpp 
	walker.cpp 
Log Message:
Removed some of the #includes from sword2.h


Index: anims.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/anims.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- anims.cpp	18 Jan 2004 19:50:59 -0000	1.53
+++ anims.cpp	5 Feb 2004 14:19:02 -0000	1.54
@@ -27,8 +27,14 @@
 #include "common/file.h"
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/controls.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
 #include "sword2/driver/animation.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 namespace Sword2 {
 

Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/build_display.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- build_display.cpp	6 Jan 2004 13:44:17 -0000	1.53
+++ build_display.cpp	5 Feb 2004 14:19:03 -0000	1.54
@@ -23,8 +23,13 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 

Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/console.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- console.cpp	6 Jan 2004 13:44:17 -0000	1.39
+++ console.cpp	5 Feb 2004 14:19:03 -0000	1.40
@@ -20,6 +20,12 @@
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/console.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 #include "common/debugger.cpp"
 

Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/controls.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- controls.cpp	9 Jan 2004 07:54:16 -0000	1.61
+++ controls.cpp	5 Feb 2004 14:19:03 -0000	1.62
@@ -18,9 +18,15 @@
  */
 
 #include "common/stdafx.h"
+#include "common/rect.h"
 #include "common/config-manager.h"
 #include "sword2/sword2.h"
+#include "sword2/controls.h"
 #include "sword2/defs.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 #define	MAX_STRING_LEN		64	// 20 was too low; better to be safe ;)
 #define CHARACTER_OVERLAP	 2	// overlap characters by 3 pixels

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/debug.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- debug.cpp	6 Jan 2004 13:44:17 -0000	1.34
+++ debug.cpp	5 Feb 2004 14:19:03 -0000	1.35
@@ -19,7 +19,12 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
 #include "sword2/defs.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 

Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/events.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- events.cpp	9 Jan 2004 14:52:38 -0000	1.25
+++ events.cpp	5 Feb 2004 14:19:03 -0000	1.26
@@ -21,6 +21,8 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
 
 namespace Sword2 {
 

Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/function.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- function.cpp	17 Jan 2004 11:15:38 -0000	1.55
+++ function.cpp	5 Feb 2004 14:19:03 -0000	1.56
@@ -22,6 +22,11 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 namespace Sword2 {
 

Index: icons.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/icons.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- icons.cpp	18 Jan 2004 20:09:45 -0000	1.32
+++ icons.cpp	5 Feb 2004 14:19:04 -0000	1.33
@@ -21,6 +21,9 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 

Index: interpreter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/interpreter.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- interpreter.cpp	10 Jan 2004 21:56:59 -0000	1.39
+++ interpreter.cpp	5 Feb 2004 14:19:04 -0000	1.40
@@ -21,6 +21,7 @@
 #include "common/util.h"
 #include "sword2/sword2.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
 
 namespace Sword2 {
 

Index: layers.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/layers.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- layers.cpp	6 Jan 2004 13:44:17 -0000	1.24
+++ layers.cpp	5 Feb 2004 14:19:04 -0000	1.25
@@ -27,6 +27,9 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/logic.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- logic.cpp	9 Jan 2004 14:52:38 -0000	1.40
+++ logic.cpp	5 Feb 2004 14:19:04 -0000	1.41
@@ -20,7 +20,10 @@
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/console.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
 
 #define LEVEL (_curObjectHub->logic_level)
 

Index: maketext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/maketext.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- maketext.cpp	18 Jan 2004 20:57:46 -0000	1.37
+++ maketext.cpp	5 Feb 2004 14:19:04 -0000	1.38
@@ -49,6 +49,9 @@
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 

Index: mem_view.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/mem_view.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- mem_view.cpp	6 Jan 2004 13:44:17 -0000	1.25
+++ mem_view.cpp	5 Feb 2004 14:19:04 -0000	1.26
@@ -19,6 +19,8 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
+#include "sword2/resman.h"
 
 #define Debug_Printf _vm->_debugger->DebugPrintf
 

Index: memory.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/memory.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- memory.cpp	18 Jan 2004 20:57:46 -0000	1.22
+++ memory.cpp	5 Feb 2004 14:19:04 -0000	1.23
@@ -36,6 +36,7 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/resman.h"
 
 namespace Sword2 {
 

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/mouse.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- mouse.cpp	9 Jan 2004 15:58:21 -0000	1.52
+++ mouse.cpp	5 Feb 2004 14:19:04 -0000	1.53
@@ -19,8 +19,15 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
+#include "sword2/controls.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 namespace Sword2 {
 

Index: protocol.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/protocol.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- protocol.cpp	6 Jan 2004 13:44:17 -0000	1.24
+++ protocol.cpp	5 Feb 2004 14:19:04 -0000	1.25
@@ -19,6 +19,7 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/resman.h"
 
 namespace Sword2 {
 

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- resman.cpp	18 Jan 2004 20:57:46 -0000	1.86
+++ resman.cpp	5 Feb 2004 14:19:04 -0000	1.87
@@ -20,7 +20,11 @@
 #include "common/stdafx.h"
 #include "common/file.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
 #include "sword2/defs.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
 
 #define Debug_Printf _vm->_debugger->DebugPrintf
 

Index: router.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/router.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- router.cpp	18 Jan 2004 20:57:46 -0000	1.39
+++ router.cpp	5 Feb 2004 14:19:04 -0000	1.40
@@ -76,6 +76,9 @@
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/resman.h"
+#include "sword2/router.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 

Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/save_rest.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- save_rest.cpp	18 Jan 2004 20:57:46 -0000	1.47
+++ save_rest.cpp	5 Feb 2004 14:19:05 -0000	1.48
@@ -30,6 +30,8 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
 
 namespace Sword2 {
 

Index: scroll.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/scroll.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- scroll.cpp	6 Jan 2004 13:44:17 -0000	1.16
+++ scroll.cpp	5 Feb 2004 14:19:05 -0000	1.17
@@ -21,6 +21,8 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
 
 namespace Sword2 {
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sound.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- sound.cpp	6 Jan 2004 13:44:17 -0000	1.39
+++ sound.cpp	5 Feb 2004 14:19:05 -0000	1.40
@@ -32,6 +32,9 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_sound.h"
 
 namespace Sword2 {
 

Index: speech.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/speech.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- speech.cpp	9 Jan 2004 14:52:39 -0000	1.57
+++ speech.cpp	5 Feb 2004 14:19:05 -0000	1.58
@@ -20,8 +20,15 @@
 #include "common/stdafx.h"
 #include "common/file.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
+#include "sword2/controls.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 namespace Sword2 {
 

Index: startup.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/startup.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- startup.cpp	6 Jan 2004 13:44:17 -0000	1.38
+++ startup.cpp	5 Feb 2004 14:19:05 -0000	1.39
@@ -20,6 +20,11 @@
 #include "common/stdafx.h"
 #include "common/file.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_sound.h"
 
 #define Debug_Printf _vm->_debugger->DebugPrintf
 

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- sword2.cpp	5 Feb 2004 00:19:57 -0000	1.103
+++ sword2.cpp	5 Feb 2004 14:19:05 -0000	1.104
@@ -23,7 +23,14 @@
 #include "base/plugins.h"
 #include "common/config-manager.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
+#include "sword2/controls.h"
 #include "sword2/defs.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 #ifdef _WIN32_WCE
 extern bool isSmartphone(void);

Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- sword2.h	8 Jan 2004 13:03:50 -0000	1.49
+++ sword2.h	5 Feb 2004 14:19:05 -0000	1.50
@@ -21,20 +21,16 @@
 #define	_SWORD2
 
 #include "base/engine.h"
+#include "common/util.h"
+
 #include "sword2/driver/driver96.h"
-#include "sword2/driver/d_sound.h"
-#include "sword2/driver/d_draw.h"
 #include "sword2/build_display.h"
-#include "sword2/console.h"
-#include "sword2/controls.h"
+#include "sword2/header.h"
 #include "sword2/icons.h"
 #include "sword2/layers.h"
-#include "sword2/logic.h"
-#include "sword2/maketext.h"
 #include "sword2/memory.h"
 #include "sword2/mouse.h"
 #include "sword2/object.h"
-#include "sword2/resman.h"
 #include "sword2/save_rest.h"
 #include "sword2/sound.h"
 
@@ -46,6 +42,14 @@
 	GF_DEMO	= 1 << 0
 };
 
+class ResourceManager;
+class Sound;
+class Graphics;
+class Logic;
+class FontRenderer;
+class Gui;
+class Debugger;
+
 class Sword2Engine : public Engine {
 private:
 	uint32 _bootParam;

Index: sync.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sync.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- sync.cpp	9 Jan 2004 14:52:39 -0000	1.17
+++ sync.cpp	5 Feb 2004 14:19:05 -0000	1.18
@@ -21,6 +21,8 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
 
 namespace Sword2 {
 

Index: walker.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/walker.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- walker.cpp	9 Jan 2004 14:52:39 -0000	1.34
+++ walker.cpp	5 Feb 2004 14:19:05 -0000	1.35
@@ -26,6 +26,9 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 





More information about the Scummvm-git-logs mailing list