[Scummvm-cvs-logs] CVS: scummvm/sword2 anims.cpp,1.41,1.42 console.cpp,1.30,1.31 debug.cpp,1.26,1.27 events.cpp,1.18,1.19 function.cpp,1.37,1.38 logic.cpp,1.29,1.30 logic.h,1.18,1.19 mouse.cpp,1.38,1.39 resman.cpp,1.64,1.65 save_rest.cpp,1.36,1.37 scroll.cpp,1.12,1.13 speech.cpp,1.45,1.46 startup.cpp,1.30,1.31 sword2.cpp,1.78,1.79 sword2.h,1.34,1.35 sync.cpp,1.13,1.14 tony_gsdk.cpp,1.16,1.17 walker.cpp,1.24,1.25 anims.h,1.6,NONE events.h,1.11,NONE scroll.h,1.4,NONE sync.h,1.8,NONE tony_gsdk.h,1.7,NONE walker.h,1.4,NONE

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Sat Nov 8 10:16:14 CET 2003 

Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv16249

Modified Files:
	anims.cpp console.cpp debug.cpp events.cpp function.cpp 
	logic.cpp logic.h mouse.cpp resman.cpp save_rest.cpp 
	scroll.cpp speech.cpp startup.cpp sword2.cpp sword2.h sync.cpp 
	tony_gsdk.cpp walker.cpp 
Removed Files:
	anims.h events.h scroll.h sync.h tony_gsdk.h walker.h 
Log Message:
Removed some now redundant header files.


Index: anims.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/anims.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- anims.cpp	8 Nov 2003 15:47:51 -0000	1.41
+++ anims.cpp	8 Nov 2003 18:15:33 -0000	1.42
@@ -27,7 +27,6 @@
 #include "sword2/sword2.h"
 #include "sword2/driver/driver96.h"
 #include "sword2/driver/d_draw.h"
-#include "sword2/anims.h"
 #include "sword2/console.h"
 #include "sword2/controls.h"		// for 'subtitles'
 #include "sword2/defs.h"
@@ -38,8 +37,6 @@
 #include "sword2/object.h"
 #include "sword2/protocol.h"
 #include "sword2/resman.h"
-#include "sword2/sword2.h"
-#include "sword2/sync.h"
 #include "sword2/sound.h"			// for Speech stuff.
 
 namespace Sword2 {

Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/console.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- console.cpp	8 Nov 2003 15:47:51 -0000	1.30
+++ console.cpp	8 Nov 2003 18:15:33 -0000	1.31
@@ -22,7 +22,6 @@
 #include "sword2/console.h"
 #include "sword2/debug.h"
 #include "sword2/defs.h"
-#include "sword2/events.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
 #include "sword2/mouse.h"

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/debug.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- debug.cpp	8 Nov 2003 15:47:51 -0000	1.26
+++ debug.cpp	8 Nov 2003 18:15:33 -0000	1.27
@@ -23,7 +23,6 @@
 #include "sword2/debug.h"
 #include "sword2/console.h"
 #include "sword2/defs.h"
-#include "sword2/events.h"			// for CountEvents()
 #include "sword2/layers.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"

Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/events.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- events.cpp	8 Nov 2003 15:47:51 -0000	1.18
+++ events.cpp	8 Nov 2003 18:15:33 -0000	1.19
@@ -22,7 +22,6 @@
 #include "sword2/console.h"
 #include "sword2/debug.h"
 #include "sword2/defs.h"
-#include "sword2/events.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"
 #include "sword2/object.h"

Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/function.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- function.cpp	8 Nov 2003 15:47:51 -0000	1.37
+++ function.cpp	8 Nov 2003 18:15:33 -0000	1.38
@@ -19,12 +19,10 @@
 
 #include "stdafx.h"
 #include "sword2/driver/driver96.h"
-#include "sword2/driver/rdwin.h"
 #include "sword2/build_display.h"
 #include "sword2/credits.h"
 #include "sword2/debug.h"
 #include "sword2/defs.h"
-#include "sword2/function.h"
 #include "sword2/interpreter.h"
 #include "sword2/layers.h"		// for '_thisScreen' structure
 #include "sword2/logic.h"

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/logic.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- logic.cpp	8 Nov 2003 15:47:51 -0000	1.29
+++ logic.cpp	8 Nov 2003 18:15:33 -0000	1.30
@@ -27,7 +27,6 @@
 #include "sword2/logic.h"
 #include "sword2/router.h"		// for clearWalkGridList()
 #include "sword2/sound.h"
-#include "sword2/sync.h"
 
 namespace Sword2 {
 

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/logic.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- logic.h	8 Nov 2003 15:47:51 -0000	1.18
+++ logic.h	8 Nov 2003 18:15:33 -0000	1.19
@@ -22,17 +22,20 @@
 #ifndef _LOGIC
 #define _LOGIC
 
-#include "sword2/events.h"
+#include "sword2/driver/driver96.h"
 #include "sword2/header.h"
 #include "sword2/memory.h"
 #include "sword2/router.h"
 #include "sword2/speech.h"
 #include "sword2/startup.h"
-#include "sword2/sync.h"
-#include "sword2/driver/driver96.h"
 
 namespace Sword2 {
 
+#define	MAX_events 10
+
+// There won't be many, will there? Probably 2 at most i reckon
+#define	MAX_syncs 10
+
 #define	TREE_SIZE 3
 
 // This must allow for the largest number of objects in a screen
@@ -384,7 +387,6 @@
 	void totalRestart(void);
 	void examineRunList(void);
 	void resetKillList(void);
-
 };
 
 extern Logic *g_logic;

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/mouse.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- mouse.cpp	8 Nov 2003 15:47:51 -0000	1.38
+++ mouse.cpp	8 Nov 2003 18:15:34 -0000	1.39
@@ -23,7 +23,6 @@
 #include "sword2/console.h"
 #include "sword2/controls.h"
 #include "sword2/defs.h"
-#include "sword2/events.h"
 #include "sword2/icons.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- resman.cpp	8 Nov 2003 15:47:51 -0000	1.64
+++ resman.cpp	8 Nov 2003 18:15:34 -0000	1.65
@@ -24,7 +24,6 @@
 #include "sword2/console.h"
 #include "sword2/debug.h"
 #include "sword2/defs.h"
-#include "sword2/function.h"
 #include "sword2/header.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"

Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/save_rest.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- save_rest.cpp	8 Nov 2003 15:47:51 -0000	1.36
+++ save_rest.cpp	8 Nov 2003 18:15:34 -0000	1.37
@@ -27,10 +27,10 @@
 // ---------------------------------------------------------------------------
 
 #include "stdafx.h"
+#include "sword2/sword2.h"
 #include "sword2/driver/driver96.h"
 #include "sword2/console.h"
 #include "sword2/defs.h"
-#include "sword2/function.h"	// for engine_logic, engine_graph, etc
 #include "sword2/interpreter.h"	// for IR_CONT, etc
 #include "sword2/layers.h"
 #include "sword2/logic.h"
@@ -40,10 +40,7 @@
 #include "sword2/resman.h"
 #include "sword2/router.h"
 #include "sword2/save_rest.h"
-#include "sword2/scroll.h"		// for Set_scrolling()
 #include "sword2/sound.h"
-#include "sword2/sword2.h"
-#include "sword2/walker.h"
 
 namespace Sword2 {
 

Index: scroll.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/scroll.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- scroll.cpp	8 Nov 2003 15:47:51 -0000	1.12
+++ scroll.cpp	8 Nov 2003 18:15:34 -0000	1.13
@@ -26,7 +26,6 @@
 #include "sword2/interpreter.h"
 #include "sword2/layers.h"
 #include "sword2/logic.h"
-#include "sword2/scroll.h"
 
 namespace Sword2 {
 

Index: speech.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/speech.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- speech.cpp	8 Nov 2003 15:47:51 -0000	1.45
+++ speech.cpp	8 Nov 2003 18:15:34 -0000	1.46
@@ -18,13 +18,11 @@
  */
 
 #include "stdafx.h"
-#include "sword2/anims.h"
+#include "sword2/sword2.h"
 #include "sword2/console.h"
 #include "sword2/controls.h"	// for 'subtitles' & 'speechSelected'
 #include "sword2/debug.h"
 #include "sword2/defs.h"
-#include "sword2/events.h"
-#include "sword2/function.h"
 #include "sword2/interpreter.h"
 #include "sword2/layers.h"		// for 'this_screen'
 #include "sword2/logic.h"
@@ -36,8 +34,6 @@
 #include "sword2/resman.h"
 #include "sword2/sound.h"
 #include "sword2/speech.h"
-#include "sword2/sword2.h"
-#include "sword2/walker.h"
 
 namespace Sword2 {
 

Index: startup.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/startup.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- startup.cpp	8 Nov 2003 15:47:51 -0000	1.30
+++ startup.cpp	8 Nov 2003 18:15:34 -0000	1.31
@@ -35,8 +35,6 @@
 #include "sword2/sound.h"
 #include "sword2/speech.h"		// for '_speechTextBlocNo' - so that speech text can be cleared when running a new start-script
 #include "sword2/startup.h"
-#include "sword2/sync.h"
-#include "sword2/tony_gsdk.h"
 
 namespace Sword2 {
 

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- sword2.cpp	8 Nov 2003 15:47:51 -0000	1.78
+++ sword2.cpp	8 Nov 2003 18:15:34 -0000	1.79
@@ -23,13 +23,13 @@
 #include "base/plugins.h"
 #include "common/config-manager.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/driver96.h"
 #include "sword2/defs.h"
 #include "sword2/build_display.h"
 #include "sword2/console.h"
 #include "sword2/controls.h"
 #include "sword2/credits.h"
 #include "sword2/debug.h"
-#include "sword2/events.h"
 #include "sword2/header.h"
 #include "sword2/interpreter.h"
 #include "sword2/layers.h"
@@ -40,13 +40,9 @@
 #include "sword2/protocol.h"
 #include "sword2/resman.h"
 #include "sword2/save_rest.h"
-#include "sword2/scroll.h"
 #include "sword2/sound.h"
 #include "sword2/speech.h"
 #include "sword2/startup.h"
-#include "sword2/sync.h"
-#include "sword2/driver/driver96.h"
-#include "sword2/driver/palette.h"
 
 #ifdef _WIN32_WCE
 extern bool isSmartphone(void);

Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- sword2.h	8 Nov 2003 15:47:51 -0000	1.34
+++ sword2.h	8 Nov 2003 18:15:34 -0000	1.35
@@ -27,7 +27,6 @@
 #include "common/str.h"
 #include "sword2/build_display.h"
 #include "sword2/console.h"
-#include "sword2/events.h"
 #include "sword2/header.h"
 #include "sword2/icons.h"
 #include "sword2/layers.h"

Index: sync.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sync.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- sync.cpp	8 Nov 2003 15:47:51 -0000	1.13
+++ sync.cpp	8 Nov 2003 18:15:35 -0000	1.14
@@ -19,11 +19,11 @@
 
 #include "stdafx.h"
 #include "common/util.h"
+#include "sword2/sword2.h"
 #include "sword2/debug.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"
-#include "sword2/sync.h"
 
 namespace Sword2 {
 

Index: tony_gsdk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/tony_gsdk.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- tony_gsdk.cpp	8 Nov 2003 15:47:51 -0000	1.16
+++ tony_gsdk.cpp	8 Nov 2003 18:15:35 -0000	1.17
@@ -20,11 +20,10 @@
 // general odds and ends
 
 #include "stdafx.h"
+#include "sword2/sword2.h"
 #include "sword2/driver/driver96.h"
 #include "sword2/debug.h"
 #include "sword2/memory.h"
-#include "sword2/tony_gsdk.h"
-#include "sword2/sword2.h"
 
 namespace Sword2 {
 

Index: walker.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/walker.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- walker.cpp	8 Nov 2003 15:47:51 -0000	1.24
+++ walker.cpp	8 Nov 2003 18:15:35 -0000	1.25
@@ -26,14 +26,11 @@
 #include "sword2/sword2.h"
 #include "sword2/console.h"
 #include "sword2/defs.h"
-#include "sword2/events.h"
-#include "sword2/function.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"
 #include "sword2/object.h"
 #include "sword2/protocol.h"
 #include "sword2/router.h"
-#include "sword2/sync.h"
 
 namespace Sword2 {
 

--- anims.h DELETED ---

--- events.h DELETED ---

--- scroll.h DELETED ---

--- sync.h DELETED ---

--- tony_gsdk.h DELETED ---

--- walker.h DELETED ---

More information about the Scummvm-git-logs mailing list