Removed includes from sword2.h so that (hopefully) there will eventua…

…lly be

less dependencies.

svn-id: r20741

engines/sword2/animation.cpp

@@ -28,8 +28,10 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/maketext.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 #include "sword2/animation.h"
 

engines/sword2/anims.cpp

@@ -30,6 +30,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/screen.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"

engines/sword2/console.cpp

@@ -20,14 +20,18 @@
  */
 
 #include "common/stdafx.h"
+#include "common/rect.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/console.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
 #include "sword2/memory.h"
 #include "sword2/mouse.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 
 #include "common/debugger.cpp"

engines/sword2/controls.cpp

@@ -26,9 +26,11 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/controls.h"
 #include "sword2/mouse.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 
 #define	MAX_STRING_LEN    64	// 20 was too low; better to be safe ;)

engines/sword2/controls.h

@@ -23,6 +23,7 @@
 #define	SWORD2_CONTROL_H
 
 #include "sword2/defs.h"
+#include "sword2/saveload.h"
 
 #define MAX_WIDGETS 25
 

engines/sword2/d_draw.cpp

@@ -21,8 +21,10 @@
 
 #include "common/stdafx.h"
 #include "common/system.h"
+
 #include "sword2/sword2.h"
 #include "sword2/mouse.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 

engines/sword2/debug.cpp

@@ -20,15 +20,19 @@
  */
 
 #include "common/stdafx.h"
+#include "common/rect.h"
+
 #include "sword2/sword2.h"
-#include "sword2/console.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
+#include "sword2/console.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
 #include "sword2/memory.h"
 #include "sword2/mouse.h"
 #include "sword2/resman.h"
 #include "sword2/router.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 

engines/sword2/events.cpp

@@ -20,8 +20,10 @@
  */
 
 #include "common/stdafx.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 
 namespace Sword2 {

engines/sword2/function.cpp

@@ -25,6 +25,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/screen.h"
 #include "sword2/console.h"
 #include "sword2/interpreter.h"

engines/sword2/icons.cpp

@@ -21,7 +21,10 @@
 
 #include "common/stdafx.h"
 #include "common/stream.h"
+#include "common/rect.h"
+
 #include "sword2/sword2.h"
+#include "sword2/header.h"
 #include "sword2/defs.h"
 #include "sword2/logic.h"
 #include "sword2/mouse.h"

engines/sword2/icons.h

@@ -22,20 +22,10 @@
 #ifndef	SWORD2_ICONS_H
 #define	SWORD2_ICONS_H
 
-#define MENU_MASTER_OBJECT	44
-#define TOTAL_subjects		(375 - 256 + 1)	// the speech subject bar
-#define TOTAL_engine_pockets	(15 + 10)	// +10 for overflow
+#error "This file is about to be removed"
 
 namespace Sword2 {
 
-// define these in a script and then register them with the system
-
-struct MenuObject {
-	int32 icon_resource;	// icon graphic graphic
-	int32 luggage_resource;	// luggage icon resource (for attaching to
-				// mouse pointer)
-};
-
 } // End of namespace Sword2
 
 #endif

engines/sword2/interpreter.cpp

@@ -21,7 +21,9 @@
 
 #include "common/stdafx.h"
 #include "common/util.h"
+
 #include "sword2/sword2.h"
+#include "sword2/header.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"

engines/sword2/layers.cpp

@@ -28,12 +28,15 @@
 //	up to 2 foreground parallax layers
 
 #include "common/stdafx.h"
+#include "common/rect.h"
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 #include "sword2/mouse.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 
 namespace Sword2 {

engines/sword2/logic.cpp

@@ -20,8 +20,10 @@
  */
 
 #include "common/stdafx.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 #include "sword2/resman.h"
 #include "sword2/router.h"

engines/sword2/maketext.cpp

@@ -39,11 +39,14 @@
 
 #include "common/stdafx.h"
 #include "common/system.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 

engines/sword2/menu.cpp

@@ -20,10 +20,13 @@
  */
 
 #include "common/stdafx.h"
+#include "common/rect.h"
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/mouse.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 

engines/sword2/mouse.cpp

@@ -26,10 +26,13 @@
 #include "sword2/console.h"
 #include "sword2/controls.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
 #include "sword2/mouse.h"
+#include "sword2/object.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 
 namespace Sword2 {

engines/sword2/mouse.h

@@ -19,15 +19,22 @@
  * $Id$
  */
 
+#include "common/rect.h"
+
 #ifndef SWORD2_MOUSE_H
 #define SWORD2_MOUSE_H
 
+#define MENU_MASTER_OBJECT	44
+
 #define	MAX_SUBJECT_LIST 30	// is that enough?
 
+#define TOTAL_subjects		(375 - 256 + 1)	// the speech subject bar
+#define TOTAL_engine_pockets	(15 + 10)	// +10 for overflow
 #define	TOTAL_mouse_list 50
 
 namespace Sword2 {
 
+class MenuObject;
 struct BuildUnit;
 
 // Menubar defines.
@@ -104,6 +111,14 @@ struct MouseUnit {
 	uint32 ref;
 };
 
+// define these in a script and then register them with the system
+
+struct MenuObject {
+	int32 icon_resource;	// icon graphic graphic
+	int32 luggage_resource;	// luggage icon resource (for attaching to
+				// mouse pointer)
+};
+
 class Mouse {
 private:
 	Sword2Engine *_vm;

engines/sword2/music.cpp

@@ -28,6 +28,7 @@
 #include "common/stdafx.h"
 #include "common/file.h"
 #include "common/system.h"
+
 #include "sound/mp3.h"
 #include "sound/vorbis.h"
 #include "sound/flac.h"
@@ -36,6 +37,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/resman.h"
 #include "sword2/sound.h"
 

engines/sword2/palette.cpp

@@ -21,10 +21,13 @@
 
 #include "common/stdafx.h"
 #include "common/system.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 

engines/sword2/protocol.cpp

@@ -20,7 +20,9 @@
  */
 
 #include "common/stdafx.h"
+
 #include "sword2/sword2.h"
+#include "sword2/header.h"
 #include "sword2/resman.h"
 
 namespace Sword2 {

engines/sword2/rdwin.cpp

@@ -21,7 +21,9 @@
 
 #include "common/stdafx.h"
 #include "common/system.h"
+
 #include "sword2/sword2.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 

engines/sword2/resman.cpp

@@ -22,13 +22,16 @@
 #include "common/stdafx.h"
 #include "common/file.h"
 #include "common/system.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/console.h"
 #include "sword2/logic.h"
 #include "sword2/memory.h"
 #include "sword2/resman.h"
 #include "sword2/router.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 
 #define Debug_Printf _vm->_debugger->DebugPrintf

engines/sword2/router.cpp

@@ -77,11 +77,14 @@
 
 #include "common/stdafx.h"
 #include "common/stream.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 #include "sword2/resman.h"
 #include "sword2/router.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 

engines/sword2/saveload.cpp

@@ -30,11 +30,16 @@
 
 #include "common/stdafx.h"
 #include "common/savefile.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
+#include "sword2/object.h"
 #include "sword2/mouse.h"
 #include "sword2/resman.h"
+#include "sword2/saveload.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 
 namespace Sword2 {

engines/sword2/screen.cpp

@@ -27,12 +27,15 @@
 #include "common/system.h"
 
 #include "sword2/sword2.h"
-#include "sword2/console.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
+#include "sword2/console.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
 #include "sword2/mouse.h"
+#include "sword2/object.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 
 namespace Sword2 {

engines/sword2/scroll.cpp

@@ -20,9 +20,12 @@
  */
 
 #include "common/stdafx.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 

engines/sword2/sound.cpp

@@ -35,6 +35,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 #include "sword2/resman.h"
 #include "sword2/sound.h"