[Scummvm-cvs-logs] CVS: scummvm/bs2 anims.cpp,1.24,1.25 anims.h,1.3,1.4 build_display.cpp,1.29,1.30 build_display.h,1.5,1.6 console.cpp,1.15,1.16 console.h,1.6,1.7 controls.cpp,1.26,1.27 credits.h,1.4,1.5 debug.cpp,1.13,1.14 debug.h,1.6,1.7 defs.h,1.3,1.4 events.cpp,1.8,1.9 events.h,1.3,1.4 function.cpp,1.22,1.23 function.h,1.3,1.4 icons.cpp,1.11,1.12 icons.h,1.4,1.5 interpreter.cpp,1.15,1.16 interpreter.h,1.9,1.10 layers.cpp,1.10,1.11 layers.h,1.4,1.5 logic.cpp,1.18,1.19 logic.h,1.5,1.6 maketext.cpp,1.18,1.19 maketext.h,1.3,1.4 mem_view.cpp,1.15,1.16 memory.cpp,1.13,1.14 memory.h,1.7,1.8 mouse.cpp,1.22,1.23 mouse.h,1.4,1.5 object.h,1.3,1.4 protocol.cpp,1.13,1.14 protocol.h,1.4,1.5 resman.cpp,1.51,1.52 resman.h,1.9,1.10 router.cpp,1.20,1.21 router.h,1.5,1.6 save_rest.cpp,1.23,1.24 save_rest.h,1.4,1.5 scroll.cpp,1.6,1.7 sound.cpp,1.22,1.23 sound.h,1.4,1.5 speech.cpp,1.28,1.29 speech.h,1.3,1.4 startup.cpp,1.18,1.19 sword2.cpp,1.48,1.49 sword2.h,1.15,1.16 sync.cpp,1.7,1.8 sync.h,1.4,1.5 tony_gsdk.cpp,1.12,1.13 tony_gsdk.h,1.4,1.5 walker.cpp,1.10,1.11

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Sat Oct 4 01:08:04 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv21172

Modified Files:
	anims.cpp anims.h build_display.cpp build_display.h 
	console.cpp console.h controls.cpp credits.h debug.cpp debug.h 
	defs.h events.cpp events.h function.cpp function.h icons.cpp 
	icons.h interpreter.cpp interpreter.h layers.cpp layers.h 
	logic.cpp logic.h maketext.cpp maketext.h mem_view.cpp 
	memory.cpp memory.h mouse.cpp mouse.h object.h protocol.cpp 
	protocol.h resman.cpp resman.h router.cpp router.h 
	save_rest.cpp save_rest.h scroll.cpp sound.cpp sound.h 
	speech.cpp speech.h startup.cpp sword2.cpp sword2.h sync.cpp 
	sync.h tony_gsdk.cpp tony_gsdk.h walker.cpp 
Log Message:
Changed to use #include "bs2/..." and removed the inclusion of standard C
headers. Most (all?) of the ones we need should probably come from stdafx.h
instead.


Index: anims.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/anims.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- anims.cpp	4 Oct 2003 00:52:25 -0000	1.24
+++ anims.cpp	4 Oct 2003 08:07:00 -0000	1.25
@@ -23,28 +23,22 @@
 // DON'T TOUCH!
 // ---------------------------------------------------------------------------
 
-#include <stdio.h>		// for sprintf
-
-#ifdef _SWORD2_DEBUG
-#include <string.h>		// for strlen
-#endif
-
 #include "stdafx.h"
 #include "common/scummsys.h"
-#include "driver/driver96.h"
-#include "anims.h"
-#include "console.h"
-#include "controls.h"		// for 'speechSelected' & 'subtitles'
-#include "defs.h"
-#include "header.h"
-#include "interpreter.h"
-#include "maketext.h"		// for MakeTextSprite used by FN_play_sequence ultimately
-#include "object.h"
-#include "protocol.h"
-#include "resman.h"
-#include "sword2.h"
-#include "sync.h"
-#include "sound.h"		// for Speech stuff.
+#include "bs2/driver/driver96.h"
+#include "bs2/anims.h"
+#include "bs2/console.h"
+#include "bs2/controls.h"		// for 'speechSelected' & 'subtitles'
+#include "bs2/defs.h"
+#include "bs2/header.h"
+#include "bs2/interpreter.h"
+#include "bs2/maketext.h"		// for MakeTextSprite used by FN_play_sequence ultimately
+#include "bs2/object.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/sword2.h"
+#include "bs2/sync.h"
+#include "bs2/sound.h"			// for Speech stuff.
 
 namespace Sword2 {
 

Index: anims.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/anims.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- anims.h	4 Oct 2003 00:52:25 -0000	1.3
+++ anims.h	4 Oct 2003 08:07:00 -0000	1.4
@@ -20,7 +20,7 @@
 #ifndef	_ANIM_S
 #define	_ANIM_S
 
-#include "driver/driver96.h"
+#include "bs2/driver/driver96.h"
 
 namespace Sword2 {
 

Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/build_display.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- build_display.cpp	4 Oct 2003 00:52:25 -0000	1.29
+++ build_display.cpp	4 Oct 2003 08:07:00 -0000	1.30
@@ -21,19 +21,17 @@
 // BUILD_DISPLAY.CPP	like the old spr_engi but slightly more aptly named
 // ---------------------------------------------------------------------------
 
-#include <stdio.h>
-
 #include "stdafx.h"
-#include "build_display.h"
-#include "console.h"
-#include "defs.h"
-#include "interpreter.h"
-#include "layers.h"
-#include "maketext.h"
-#include "mouse.h"
-#include "object.h"
-#include "protocol.h"
-#include "resman.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/defs.h"
+#include "bs2/interpreter.h"
+#include "bs2/layers.h"
+#include "bs2/maketext.h"
+#include "bs2/mouse.h"
+#include "bs2/object.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
 
 namespace Sword2 {
 

Index: build_display.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/build_display.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- build_display.h	4 Oct 2003 00:52:25 -0000	1.5
+++ build_display.h	4 Oct 2003 08:07:01 -0000	1.6
@@ -20,7 +20,7 @@
 #ifndef	_BUILD_DISPLAY
 #define	_BUILD_DISPLAY
 
-#include "driver/driver96.h"
+#include "bs2/driver/driver96.h"
 
 namespace Sword2 {
 

Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/console.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- console.cpp	4 Oct 2003 00:52:25 -0000	1.15
+++ console.cpp	4 Oct 2003 08:07:01 -0000	1.16
@@ -18,7 +18,7 @@
  */
 
 #include "stdafx.h"
-#include "driver/driver96.h"
+#include "bs2/driver/driver96.h"
 
 namespace Sword2 {
 uint32	console_status = 0;	//0 off		// LEFT IN RELEASE VERSION
@@ -28,30 +28,24 @@
 
 // its the console! <great>
 
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>		// for version string stuff
-
-#include "build_display.h"
-#include "console.h"
-#include "debug.h"
-#include "defs.h"
-#include "events.h"		// so we can display the event list in Con_display_events()
-#include "header.h"
-#include "layers.h"
-#include "logic.h"
-#include "maketext.h"		// for InitialiseFontResourceFlags()
-#include "mouse.h"
-#include "mem_view.h"
-#include "memory.h"
-#include "protocol.h"
-#include "resman.h"
-#include "save_rest.h"
-#include "startup.h"
-#include "sword2.h"
-#include "time.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/events.h"		// so we can display the event list in Con_display_events()
+#include "bs2/header.h"
+#include "bs2/layers.h"
+#include "bs2/logic.h"
+#include "bs2/maketext.h"	// for InitialiseFontResourceFlags()
+#include "bs2/mouse.h"
+#include "bs2/mem_view.h"
+#include "bs2/memory.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/save_rest.h"
+#include "bs2/startup.h"
+#include "bs2/sword2.h"
+#include "bs2/time.h"
 
 namespace Sword2 {
 

Index: console.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/console.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- console.h	4 Oct 2003 00:52:25 -0000	1.6
+++ console.h	4 Oct 2003 08:07:01 -0000	1.7
@@ -20,8 +20,8 @@
 #ifndef	C_ONSOLE_H
 #define	C_ONSOLE_H
 
-#include "driver/driver96.h"
-#include "memory.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/memory.h"
 
 namespace Sword2 {
 

Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/controls.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- controls.cpp	4 Oct 2003 01:09:29 -0000	1.26
+++ controls.cpp	4 Oct 2003 08:07:01 -0000	1.27
@@ -18,23 +18,23 @@
  */
 
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "build_display.h"
-#include "console.h"
-#include "controls.h"
-#include "defs.h"
-#include "header.h"
-#include "interpreter.h"
-#include "layers.h"
-#include "logic.h"
-#include "maketext.h"			// for font resource variables
-#include "mouse.h"
-#include "protocol.h"
-#include "resman.h"
-#include "router.h"
-#include "save_rest.h"
-#include "sound.h"
-#include "sword2.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/controls.h"
+#include "bs2/defs.h"
+#include "bs2/header.h"
+#include "bs2/interpreter.h"
+#include "bs2/layers.h"
+#include "bs2/logic.h"
+#include "bs2/maketext.h"			// for font resource variables
+#include "bs2/mouse.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/router.h"
+#include "bs2/save_rest.h"
+#include "bs2/sound.h"
+#include "bs2/sword2.h"
 
 namespace Sword2 {
 

Index: credits.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/credits.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- credits.h	4 Oct 2003 00:52:25 -0000	1.4
+++ credits.h	4 Oct 2003 08:07:01 -0000	1.5
@@ -17,10 +17,10 @@
  * $Header$
  */
 
-#ifndef _Credits_h_
-#define _Credits_h_
+#ifndef _CREDITS_H
+#define _CREDITS_H
 
-#include "driver/driver96.h"
+#include "bs2/driver/driver96.h"
 
 namespace Sword2 {
 

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/debug.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- debug.cpp	4 Oct 2003 00:52:25 -0000	1.13
+++ debug.cpp	4 Oct 2003 08:07:01 -0000	1.14
@@ -17,31 +17,25 @@
  * $Header$
  */
 
-#include <stdarg.h> // for ExitWithReport, which stays in RELEASE version
-#include <stdio.h>
-
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "debug.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/debug.h"
 
 // this whole file (except ExitWithReport) only included on debug versions
 #ifdef _SWORD2_DEBUG
 
-#include <stdlib.h>
-
-#include "build_display.h"		// for 'fps'
-#include "console.h"
-#include "defs.h"
-#include "events.h"			// for CountEvents()
-#include "layers.h"
-#include "logic.h"
-#include "maketext.h"
-#include "mem_view.h"
-#include "mouse.h"
-#include "protocol.h"
-#include "resman.h"
-#include "router.h"			// for PlotWalkGrid()
-#include "speech.h"			// for 'officialTextNumber' and
+#include "bs2/build_display.h"		// for 'fps'
+#include "bs2/console.h"
+#include "bs2/defs.h"
+#include "bs2/events.h"			// for CountEvents()
+#include "bs2/layers.h"
+#include "bs2/logic.h"
+#include "bs2/maketext.h"
+#include "bs2/mouse.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/router.h"			// for PlotWalkGrid()
+#include "bs2/speech.h"			// for 'officialTextNumber' and
 					// 'speechScriptWaiting'
 
 namespace Sword2 {

Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/debug.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- debug.h	4 Oct 2003 00:52:25 -0000	1.6
+++ debug.h	4 Oct 2003 08:07:01 -0000	1.7
@@ -23,8 +23,8 @@
 // this whole file only included on debug versions
 #ifdef _SWORD2_DEBUG
 
-#include "driver.h"
-#include "object.h"
+#include "bs2/driver.h"
+#include "bs2/object.h"
 
 namespace Sword2 {
 

Index: defs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/defs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- defs.h	30 Sep 2003 09:27:26 -0000	1.3
+++ defs.h	4 Oct 2003 08:07:01 -0000	1.4
@@ -20,8 +20,8 @@
 #ifndef	DEFS
 #define	DEFS
 
-#include "header.h"
-#include "resman.h"
+#include "bs2/header.h"
+#include "bs2/resman.h"
 
 #define	SIZE	0x10000			// 65536 items per section
 #define	NuSIZE	0xffff			// & with this

Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/events.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- events.cpp	4 Oct 2003 00:52:25 -0000	1.8
+++ events.cpp	4 Oct 2003 08:07:01 -0000	1.9
@@ -18,15 +18,15 @@
  */
 
 #include "stdafx.h"
-#include "console.h"
-#include "debug.h"
-#include "defs.h"
-#include "events.h"
-#include "interpreter.h"
-#include "logic.h"
-#include "memory.h"
-#include "object.h"
-#include "sync.h"
+#include "bs2/console.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/events.h"
+#include "bs2/interpreter.h"
+#include "bs2/logic.h"
+#include "bs2/memory.h"
+#include "bs2/object.h"
+#include "bs2/sync.h"
 
 namespace Sword2 {
 

Index: events.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/events.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- events.h	4 Oct 2003 00:52:25 -0000	1.3
+++ events.h	4 Oct 2003 08:07:01 -0000	1.4
@@ -20,7 +20,7 @@
 #ifndef	_EVENTS
 #define	_EVENTS
 
-#include "object.h"
+#include "bs2/object.h"
 
 namespace Sword2 {
 

Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/function.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- function.cpp	4 Oct 2003 00:52:25 -0000	1.22
+++ function.cpp	4 Oct 2003 08:07:01 -0000	1.23
@@ -18,20 +18,20 @@
  */
 
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "driver/rdwin.h"
-#include "build_display.h"
-#include "credits.h"
-#include "debug.h"
-#include "defs.h"
-#include "function.h"
-#include "interpreter.h"
-#include "layers.h"		// for 'this_screen' structure
-#include "logic.h"
-#include "protocol.h"
-#include "resman.h"
-#include "sound.h"
-#include "sword2.h"		// for CloseGame()
+#include "bs2/driver/driver96.h"
+#include "bs2/driver/rdwin.h"
+#include "bs2/build_display.h"
+#include "bs2/credits.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/function.h"
+#include "bs2/interpreter.h"
+#include "bs2/layers.h"		// for 'this_screen' structure
+#include "bs2/logic.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/sound.h"
+#include "bs2/sword2.h"		// for CloseGame()
 
 namespace Sword2 {
 

Index: function.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/function.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- function.h	4 Oct 2003 00:52:25 -0000	1.3
+++ function.h	4 Oct 2003 08:07:01 -0000	1.4
@@ -20,7 +20,7 @@
 #ifndef	_FUNCTION
 #define	_FUNCTION
 
-#include "object.h"
+#include "bs2/object.h"
 
 namespace Sword2 {
 

Index: icons.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/icons.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- icons.cpp	4 Oct 2003 00:52:25 -0000	1.11
+++ icons.cpp	4 Oct 2003 08:07:01 -0000	1.12
@@ -18,10 +18,11 @@
  */
 
 #include "stdafx.h"
-#include "defs.h"
-#include "icons.h"
-#include "interpreter.h"
-#include "mouse.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/defs.h"
+#include "bs2/icons.h"
+#include "bs2/interpreter.h"
+#include "bs2/mouse.h"
 
 namespace Sword2 {
 

Index: icons.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/icons.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- icons.h	4 Oct 2003 00:52:25 -0000	1.4
+++ icons.h	4 Oct 2003 08:07:01 -0000	1.5
@@ -20,7 +20,7 @@
 #ifndef	_ICONS
 #define	_ICONS
 
-#include "object.h"
+#include "bs2/object.h"
 
 namespace Sword2 {
 

Index: interpreter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/interpreter.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- interpreter.cpp	4 Oct 2003 00:52:25 -0000	1.15
+++ interpreter.cpp	4 Oct 2003 08:07:01 -0000	1.16
@@ -18,10 +18,9 @@
  */
 
 #include "stdafx.h"
-
-#include "console.h"
-#include "driver/driver96.h"
-#include "interpreter.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/console.h"
+#include "bs2/interpreter.h"
 
 namespace Sword2 {
 

Index: interpreter.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/interpreter.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- interpreter.h	4 Oct 2003 00:52:25 -0000	1.9
+++ interpreter.h	4 Oct 2003 08:07:01 -0000	1.10
@@ -20,8 +20,8 @@
 #ifndef _INTERPRETER
 #define _INTERPRETER
 
-#include "debug.h"
-#include "header.h"
+#include "bs2/debug.h"
+#include "bs2/header.h"
 
 namespace Sword2 {
 

Index: layers.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/layers.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- layers.cpp	4 Oct 2003 00:52:25 -0000	1.10
+++ layers.cpp	4 Oct 2003 08:07:01 -0000	1.11
@@ -26,13 +26,13 @@
 //	up to 2 foreground parallax layers
 
 #include "stdafx.h"
-#include "build_display.h"
-#include "debug.h"
-#include "header.h"
-#include "layers.h"
-#include "protocol.h"
-#include "resman.h"
-#include "sound.h"	// for Clear_fx_queue() called from FN_init_background()
+#include "bs2/build_display.h"
+#include "bs2/debug.h"
+#include "bs2/header.h"
+#include "bs2/layers.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/sound.h"	// for Clear_fx_queue() called from FN_init_background()
 
 namespace Sword2 {
 

Index: layers.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/layers.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- layers.h	4 Oct 2003 00:52:25 -0000	1.4
+++ layers.h	4 Oct 2003 08:07:02 -0000	1.5
@@ -20,8 +20,6 @@
 #ifndef	_LAYERS
 #define	_LAYERS
 
-#include "memory.h"
-
 namespace Sword2 {
 
 typedef	struct {

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/logic.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- logic.cpp	4 Oct 2003 00:52:25 -0000	1.18
+++ logic.cpp	4 Oct 2003 08:07:02 -0000	1.19
@@ -18,14 +18,14 @@
  */
 
 #include "stdafx.h"
-#include "build_display.h"
-#include "console.h"
-#include "debug.h"
-#include "interpreter.h"
-#include "logic.h"
-#include "router.h"		// for ClearWalkGridList()
-#include "sound.h"
-#include "sync.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/debug.h"
+#include "bs2/interpreter.h"
+#include "bs2/logic.h"
+#include "bs2/router.h"		// for ClearWalkGridList()
+#include "bs2/sound.h"
+#include "bs2/sync.h"
 
 namespace Sword2 {
 

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/logic.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- logic.h	4 Oct 2003 00:52:25 -0000	1.5
+++ logic.h	4 Oct 2003 08:07:02 -0000	1.6
@@ -22,8 +22,8 @@
 #ifndef _LOGIC
 #define _LOGIC
 
-#include "defs.h"
-#include "header.h"
+#include "bs2/defs.h"
+#include "bs2/header.h"
 
 namespace Sword2 {
 

Index: maketext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/maketext.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- maketext.cpp	4 Oct 2003 00:52:25 -0000	1.18
+++ maketext.cpp	4 Oct 2003 08:07:02 -0000	1.19
@@ -50,19 +50,17 @@
 #define LAST_CHAR	255	// last character in character set
 #define DUD		64	// the first "chequered flag" (dud) symbol in
 				// our character set is in the '@' position
-#include <string.h>
-
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "console.h"
-#include "debug.h"
-#include "defs.h"		// for SPEECH_FONT_ID & CONSOLE_FONT_ID
-#include "header.h"
-#include "maketext.h"
-#include "memory.h"
-#include "protocol.h"		// for FetchFrameHeader()
-#include "resman.h"
-#include "sword2.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/console.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"		// for SPEECH_FONT_ID & CONSOLE_FONT_ID
+#include "bs2/header.h"
+#include "bs2/maketext.h"
+#include "bs2/memory.h"
+#include "bs2/protocol.h"	// for FetchFrameHeader()
+#include "bs2/resman.h"
+#include "bs2/sword2.h"
 
 namespace Sword2 {
 

Index: maketext.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/maketext.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- maketext.h	4 Oct 2003 00:52:25 -0000	1.3
+++ maketext.h	4 Oct 2003 08:07:02 -0000	1.4
@@ -57,7 +57,7 @@
 #ifndef _MAKETEXT_H
 #define _MAKETEXT_H
 
-#include "memory.h"
+#include "bs2/memory.h"
 
 namespace Sword2 {
 
@@ -77,7 +77,7 @@
 void Init_text_bloc_system(void);
 
 void Kill_text_bloc(uint32 bloc_number);
-void Print_text_blocs(void);	// Tony16Oct96
+void Print_text_blocs(void);
 
 uint32 Build_new_block(uint8 *ascii, int16 x, int16 y, uint16 width, uint8 pen, uint32 type, uint32 fontRes, uint8 justification);
 
@@ -85,9 +85,9 @@
 #define FINNISH_TEXT	1
 #define POLISH_TEXT	2
 
-// this one works out the language from the text cluster (James31july97)
+// this one works out the language from the text cluster
 void InitialiseFontResourceFlags(void);
-// this one allow you to select the fonts yourself (James31july97)
+// this one allow you to select the fonts yourself
 void InitialiseFontResourceFlags(uint8 language);
 
 extern uint32 speech_font_id;

Index: mem_view.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/mem_view.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- mem_view.cpp	4 Oct 2003 01:09:29 -0000	1.15
+++ mem_view.cpp	4 Oct 2003 08:07:02 -0000	1.16
@@ -18,11 +18,11 @@
  */
 
 #include "stdafx.h"
-#include "build_display.h"
-#include "console.h"
-#include "header.h"
-#include "memory.h"
-#include "resman.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/header.h"
+#include "bs2/memory.h"
+#include "bs2/resman.h"
 
 namespace Sword2 {
 

Index: memory.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/memory.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- memory.cpp	4 Oct 2003 01:09:29 -0000	1.13
+++ memory.cpp	4 Oct 2003 08:07:02 -0000	1.14
@@ -38,10 +38,10 @@
 // MemMan v1.1
 
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "debug.h"
-#include "memory.h"
-#include "resman.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/debug.h"
+#include "bs2/memory.h"
+#include "bs2/resman.h"
 
 namespace Sword2 {
 

Index: memory.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/memory.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- memory.h	4 Oct 2003 01:09:29 -0000	1.7
+++ memory.h	4 Oct 2003 08:07:02 -0000	1.8
@@ -20,8 +20,6 @@
 #ifndef	MEMORY_H
 #define	MEMORY_H
 
-#include "common/scummsys.h"
-
 namespace Sword2 {
 
 typedef	struct {

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/mouse.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mouse.cpp	4 Oct 2003 00:52:26 -0000	1.22
+++ mouse.cpp	4 Oct 2003 08:07:02 -0000	1.23
@@ -18,22 +18,22 @@
  */
 
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "build_display.h"
-#include "console.h"
-#include "controls.h"
-#include "defs.h"
-#include "events.h"
-#include "icons.h"
-#include "interpreter.h"
-#include "layers.h"
-#include "maketext.h"
-#include "mouse.h"
-#include "object.h"
-#include "protocol.h"
-#include "resman.h"
-#include "sound.h"
-#include "sword2.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/controls.h"
+#include "bs2/defs.h"
+#include "bs2/events.h"
+#include "bs2/icons.h"
+#include "bs2/interpreter.h"
+#include "bs2/layers.h"
+#include "bs2/maketext.h"
+#include "bs2/mouse.h"
+#include "bs2/object.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/sound.h"
+#include "bs2/sword2.h"
 
 namespace Sword2 {
 

Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/mouse.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mouse.h	4 Oct 2003 00:52:26 -0000	1.4
+++ mouse.h	4 Oct 2003 08:07:02 -0000	1.5
@@ -17,12 +17,10 @@
  * $Header$
  */
 
-//mouse stuff
-
 #ifndef MOUSE_H
 #define MOUSE_H
 
-#include "object.h"
+#include "bs2/object.h"
 
 namespace Sword2 {
 

Index: object.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/object.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- object.h	4 Oct 2003 00:52:26 -0000	1.3
+++ object.h	4 Oct 2003 08:07:02 -0000	1.4
@@ -20,8 +20,6 @@
 #ifndef	_SCRIPT_STRUCTURES
 #define	_SCRIPT_STRUCTURES
 
-#include "driver/driver96.h"
-
 namespace Sword2 {
 
 // these structures represent the broken up compact components

Index: protocol.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/protocol.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- protocol.cpp	4 Oct 2003 00:52:26 -0000	1.13
+++ protocol.cpp	4 Oct 2003 08:07:02 -0000	1.14
@@ -17,15 +17,13 @@
  * $Header$
  */
 
-#include <stdio.h>
-
 #include "stdafx.h"
-#include "console.h"
-#include "defs.h"
-#include "header.h"
-#include "memory.h"
-#include "protocol.h"
-#include "resman.h"
+#include "bs2/console.h"
+#include "bs2/defs.h"
+#include "bs2/header.h"
+#include "bs2/memory.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
 
 namespace Sword2 {
 

Index: protocol.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/protocol.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- protocol.h	4 Oct 2003 00:52:26 -0000	1.4
+++ protocol.h	4 Oct 2003 08:07:02 -0000	1.5
@@ -22,8 +22,8 @@
 #ifndef	_PROTOCOL
 #define	_PROTOCOL
 
-#include "driver/driver96.h"
-#include "header.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/header.h"
 
 namespace Sword2 {
 

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/resman.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- resman.cpp	4 Oct 2003 01:09:29 -0000	1.51
+++ resman.cpp	4 Oct 2003 08:07:02 -0000	1.52
@@ -17,31 +17,23 @@
  * $Header$
  */
 
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "stdafx.h"
-
-#include "base/engine.h"
-#include "common/file.h"
-
-#include "driver/driver96.h"
-#include "build_display.h"
-#include "console.h"
-#include "debug.h"
-#include "defs.h"
-#include "function.h"
-#include "header.h"
-#include "interpreter.h"
-#include "maketext.h"
-#include "memory.h"
-#include "mouse.h"	// for system Set_mouse & Set_luggage routines
-#include "protocol.h"
-#include "resman.h"
-#include "sound.h"	// for Clear_fx_queue() called from cacheNewCluster()
-#include "sword2.h"	// for CloseGame()
-#include "router.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/function.h"
+#include "bs2/header.h"
+#include "bs2/interpreter.h"
+#include "bs2/maketext.h"
+#include "bs2/memory.h"
+#include "bs2/mouse.h"	// for system Set_mouse & Set_luggage routines
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/sound.h"	// for Clear_fx_queue() called from cacheNewCluster()
+#include "bs2/sword2.h"	// for CloseGame()
+#include "bs2/router.h"
 
 namespace Sword2 {
 

Index: resman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/resman.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- resman.h	4 Oct 2003 01:09:29 -0000	1.9
+++ resman.h	4 Oct 2003 08:07:02 -0000	1.10
@@ -20,7 +20,7 @@
 #ifndef	RESMAN_H
 #define	RESMAN_H
 
-#include "memory.h"
+#include "bs2/memory.h"
 
 namespace Sword2 {
 

Index: router.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/router.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- router.cpp	4 Oct 2003 00:52:26 -0000	1.20
+++ router.cpp	4 Oct 2003 08:07:02 -0000	1.21
@@ -78,16 +78,16 @@
  */
 
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "console.h"
-#include "debug.h"
-#include "defs.h"
-#include "header.h"
-#include "interpreter.h"
-#include "memory.h"
-#include "object.h"
-#include "resman.h"
-#include "router.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/console.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/header.h"
+#include "bs2/interpreter.h"
+#include "bs2/memory.h"
+#include "bs2/object.h"
+#include "bs2/resman.h"
+#include "bs2/router.h"
 
 namespace Sword2 {
 

Index: router.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/router.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- router.h	4 Oct 2003 00:52:26 -0000	1.5
+++ router.h	4 Oct 2003 08:07:02 -0000	1.6
@@ -20,8 +20,8 @@
 #ifndef _ROUTER_H
 #define _ROUTER_H
 
-#include "memory.h"
-#include "object.h"
+#include "bs2/memory.h"
+#include "bs2/object.h"
 
 namespace Sword2 {
 

Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/save_rest.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- save_rest.cpp	4 Oct 2003 00:52:26 -0000	1.23
+++ save_rest.cpp	4 Oct 2003 08:07:02 -0000	1.24
@@ -26,26 +26,24 @@
 //
 // ---------------------------------------------------------------------------
 
-#include <stdio.h>
-
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "console.h"
-#include "defs.h"
-#include "function.h"		// for engine_logic, engine_graph, etc
-#include "interpreter.h"	// for IR_CONT, etc
-#include "layers.h"
-#include "logic.h"
-#include "memory.h"
-#include "object.h"
-#include "protocol.h"
-#include "resman.h"
-#include "router.h"
-#include "save_rest.h"
-#include "scroll.h"		// for Set_scrolling()
-#include "sound.h"
-#include "sword2.h"
-#include "walker.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/console.h"
+#include "bs2/defs.h"
+#include "bs2/function.h"	// for engine_logic, engine_graph, etc
+#include "bs2/interpreter.h"	// for IR_CONT, etc
+#include "bs2/layers.h"
+#include "bs2/logic.h"
+#include "bs2/memory.h"
+#include "bs2/object.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/router.h"
+#include "bs2/save_rest.h"
+#include "bs2/scroll.h"		// for Set_scrolling()
+#include "bs2/sound.h"
+#include "bs2/sword2.h"
+#include "bs2/walker.h"
 
 namespace Sword2 {
 

Index: save_rest.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/save_rest.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- save_rest.h	4 Oct 2003 00:52:26 -0000	1.4
+++ save_rest.h	4 Oct 2003 08:07:02 -0000	1.5
@@ -20,7 +20,7 @@
 #ifndef	SAVE_REST_H
 #define	SAVE_REST_H
 
-#include "memory.h"
+#include "bs2/memory.h"
 
 namespace Sword2 {
 

Index: scroll.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/scroll.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- scroll.cpp	4 Oct 2003 00:52:26 -0000	1.6
+++ scroll.cpp	4 Oct 2003 08:07:02 -0000	1.7
@@ -18,13 +18,13 @@
  */
 
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "debug.h"
-#include "defs.h"
-#include "header.h"
-#include "interpreter.h"
-#include "layers.h"
-#include "scroll.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/header.h"
+#include "bs2/interpreter.h"
+#include "bs2/layers.h"
+#include "bs2/scroll.h"
 
 namespace Sword2 {
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sound.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sound.cpp	4 Oct 2003 00:52:26 -0000	1.22
+++ sound.cpp	4 Oct 2003 08:07:02 -0000	1.23
@@ -27,16 +27,14 @@
 //
 // ---------------------------------------------------------------------------
 
-#include <stdio.h>
-
 #include "stdafx.h"
-#include "console.h"
-#include "defs.h"		// for RESULT
-#include "interpreter.h"
-#include "protocol.h"		// for FetchObjectName() for debugging FN_play_fx
-#include "resman.h"
-#include "sound.h"
-#include "sword2.h"
+#include "bs2/console.h"
+#include "bs2/defs.h"		// for RESULT
+#include "bs2/interpreter.h"
+#include "bs2/protocol.h"	// for FetchObjectName() for debugging FN_play_fx
+#include "bs2/resman.h"
+#include "bs2/sound.h"
+#include "bs2/sword2.h"
 
 namespace Sword2 {
 

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sound.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sound.h	4 Oct 2003 00:52:26 -0000	1.4
+++ sound.h	4 Oct 2003 08:07:02 -0000	1.5
@@ -30,8 +30,6 @@
 #ifndef SOUND_H
 #define SOUND_H
 
-#include "common/scummsys.h"
-
 namespace Sword2 {
 
 // fx types

Index: speech.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/speech.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- speech.cpp	4 Oct 2003 00:52:26 -0000	1.28
+++ speech.cpp	4 Oct 2003 08:07:02 -0000	1.29
@@ -18,28 +18,26 @@
  */
 
 #include "stdafx.h"
-
-#include "stdafx.h"
-#include "anims.h"
-#include "console.h"
-#include "controls.h"	// for 'subtitles' & 'speechSelected'
-#include "debug.h"
-#include "defs.h"
-#include "events.h"
-#include "function.h"
-#include "interpreter.h"
-#include "layers.h"	// for 'this_screen'
-#include "logic.h"
-#include "maketext.h"
-#include "memory.h"
-#include "mouse.h"
-#include "object.h"
-#include "protocol.h"
-#include "resman.h"
-#include "sound.h"
-#include "speech.h"
-#include "sword2.h"
-#include "walker.h"
+#include "bs2/anims.h"
+#include "bs2/console.h"
+#include "bs2/controls.h"	// for 'subtitles' & 'speechSelected'
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/events.h"
+#include "bs2/function.h"
+#include "bs2/interpreter.h"
+#include "bs2/layers.h"		// for 'this_screen'
+#include "bs2/logic.h"
+#include "bs2/maketext.h"
+#include "bs2/memory.h"
+#include "bs2/mouse.h"
+#include "bs2/object.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/sound.h"
+#include "bs2/speech.h"
+#include "bs2/sword2.h"
+#include "bs2/walker.h"
 
 namespace Sword2 {
 

Index: speech.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/speech.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- speech.h	4 Oct 2003 00:52:26 -0000	1.3
+++ speech.h	4 Oct 2003 08:07:02 -0000	1.4
@@ -20,7 +20,7 @@
 #ifndef	_SPEECH
 #define	_SPEECH
 
-#include "header.h"
+#include "bs2/header.h"
 
 namespace Sword2 {
 

Index: startup.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/startup.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- startup.cpp	4 Oct 2003 00:52:26 -0000	1.18
+++ startup.cpp	4 Oct 2003 08:07:02 -0000	1.19
@@ -17,27 +17,25 @@
  * $Header$
  */
 
-#include <stdio.h>
-
 #include "stdafx.h"
-#include "build_display.h"
-#include "console.h"
-#include "debug.h"
-#include "defs.h"
-#include "header.h"
-#include "interpreter.h"
-#include "maketext.h"		// for Kill_text_bloc()
-#include "memory.h"
-#include "mouse.h"		// for FN_add_human()
-#include "object.h"
-#include "resman.h"
-#include "router.h"
-#include "sound.h"
-#include "speech.h"		// for 'speech_text_bloc_no' - so that speech text can be cleared when running a new start-script
-#include "startup.h"
-#include "sword2.h"		// (James11aug97) for CloseGame()
-#include "sync.h"
-#include "tony_gsdk.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/header.h"
+#include "bs2/interpreter.h"
+#include "bs2/maketext.h"	// for Kill_text_bloc()
+#include "bs2/memory.h"
+#include "bs2/mouse.h"		// for FN_add_human()
+#include "bs2/object.h"
+#include "bs2/resman.h"
+#include "bs2/router.h"
+#include "bs2/sound.h"
+#include "bs2/speech.h"		// for 'speech_text_bloc_no' - so that speech text can be cleared when running a new start-script
+#include "bs2/startup.h"
+#include "bs2/sword2.h"		// for CloseGame()
+#include "bs2/sync.h"
+#include "bs2/tony_gsdk.h"
 
 namespace Sword2 {
 

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sword2.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- sword2.cpp	4 Oct 2003 01:09:29 -0000	1.48
+++ sword2.cpp	4 Oct 2003 08:07:02 -0000	1.49
@@ -18,12 +18,9 @@
  */
 
 #include "stdafx.h"
-
 #include "base/gameDetector.h"
 #include "base/plugins.h"
-
 #include "common/config-file.h"
-
 #include "bs2/build_display.h"
 #include "bs2/console.h"
 #include "bs2/controls.h"

Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sword2.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- sword2.h	4 Oct 2003 01:09:29 -0000	1.15
+++ sword2.h	4 Oct 2003 08:07:02 -0000	1.16
@@ -20,7 +20,12 @@
 #ifndef	_SWORD2
 #define	_SWORD2
 
-#include "driver/d_sound.h"
+#include "base/engine.h"
+#include "common/file.h"
+#include "common/map.h"
+#include "common/rect.h"
+#include "common/str.h"
+#include "bs2/driver/d_sound.h"
 
 enum BSGameId {
 	GID_SWORD2 = GID_SWORD2_FIRST,

Index: sync.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sync.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sync.cpp	4 Oct 2003 00:52:26 -0000	1.7
+++ sync.cpp	4 Oct 2003 08:07:02 -0000	1.8
@@ -18,10 +18,11 @@
  */
 
 #include "stdafx.h"
-#include "debug.h"
-#include "defs.h"
-#include "interpreter.h"
-#include "sync.h"
+#include "common/util.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/interpreter.h"
+#include "bs2/sync.h"
 
 namespace Sword2 {
 

Index: sync.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sync.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sync.h	4 Oct 2003 00:52:26 -0000	1.4
+++ sync.h	4 Oct 2003 08:07:02 -0000	1.5
@@ -20,7 +20,7 @@
 #ifndef	_SYNC
 #define	_SYNC
 
-#include "object.h"
+#include "bs2/object.h"
 
 namespace Sword2 {
 

Index: tony_gsdk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/tony_gsdk.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- tony_gsdk.cpp	4 Oct 2003 00:52:26 -0000	1.12
+++ tony_gsdk.cpp	4 Oct 2003 08:07:02 -0000	1.13
@@ -20,12 +20,11 @@
 // general odds and ends
 
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "debug.h"
-#include "memory.h"
-#include "tony_gsdk.h"
-#include "sword2.h"
-#include "common/file.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/debug.h"
+#include "bs2/memory.h"
+#include "bs2/tony_gsdk.h"
+#include "bs2/sword2.h"
 
 namespace Sword2 {
 

Index: tony_gsdk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/tony_gsdk.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tony_gsdk.h	4 Oct 2003 00:52:26 -0000	1.4
+++ tony_gsdk.h	4 Oct 2003 08:07:02 -0000	1.5
@@ -20,7 +20,7 @@
 #ifndef	TONY_GSDK
 #define	TONY_GSDK
 
-#include "memory.h"
+#include "bs2/memory.h"
 
 namespace Sword2 {
 

Index: walker.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/walker.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- walker.cpp	4 Oct 2003 00:52:26 -0000	1.10
+++ walker.cpp	4 Oct 2003 08:07:02 -0000	1.11
@@ -34,16 +34,16 @@
 // FN_get_pos()			// get details of another mega's position
 
 #include "stdafx.h"
-#include "console.h"
-#include "defs.h"
-#include "events.h"
-#include "function.h"
-#include "interpreter.h"
-#include "logic.h"		// for FN_add_to_kill_list
-#include "object.h"
-#include "protocol.h"
-#include "router.h"
-#include "sync.h"
+#include "bs2/console.h"
+#include "bs2/defs.h"
+#include "bs2/events.h"
+#include "bs2/function.h"
+#include "bs2/interpreter.h"
+#include "bs2/logic.h"		// for FN_add_to_kill_list
+#include "bs2/object.h"
+#include "bs2/protocol.h"
+#include "bs2/router.h"
+#include "bs2/sync.h"
 
 namespace Sword2 {
 





More information about the Scummvm-git-logs mailing list