LAB: Reduced dependency on processroom.h. Yay!

engines/lab/engine.cpp

@@ -38,6 +38,7 @@
 #include "lab/intro.h"
 #include "lab/labsets.h"
 #include "lab/music.h"
+#include "lab/processroom.h"
 #include "lab/resource.h"
 #include "lab/utils.h"
 

engines/lab/lab.cpp

@@ -41,6 +41,7 @@
 #include "lab/eventman.h"
 #include "lab/image.h"
 #include "lab/music.h"
+#include "lab/processroom.h"
 #include "lab/resource.h"
 #include "lab/utils.h"
 

engines/lab/lab.h

@@ -35,21 +35,25 @@
 #include "common/rect.h"
 
 #include "engines/engine.h"
-#include "lab/processroom.h"
 
 struct ADGameDescription;
 
 namespace Lab {
 
+struct Action;
 class Anim;
+struct CloseData;
 class DisplayMan;
 class EventManager;
 struct Gadget;
 class Image;
 struct IntuiMessage;
+struct InventoryData;
 class LargeSet;
 class Music;
 class Resource;
+struct RoomData;
+struct Rule;
 struct TextFont;
 class Utils;
 
@@ -75,6 +79,9 @@ struct CrumbData {
 
 #define MAX_CRUMBS          128
 
+typedef CloseData *CloseDataPtr;
+typedef Common::List<Rule *> RuleList;
+
 // Direction defines
 #define NORTH   0
 #define SOUTH   1

engines/lab/map.cpp

@@ -36,6 +36,7 @@
 #include "lab/interface.h"
 #include "lab/labsets.h"
 #include "lab/music.h"
+#include "lab/processroom.h"
 #include "lab/resource.h"
 #include "lab/utils.h"
 

engines/lab/processroom.cpp

@@ -36,6 +36,7 @@
 #include "lab/dispman.h"
 #include "lab/labsets.h"
 #include "lab/music.h"
+#include "lab/processroom.h"
 #include "lab/resource.h"
 #include "lab/utils.h"
 

engines/lab/processroom.h

@@ -101,8 +101,6 @@ typedef struct CloseData {
 	CloseData *_subCloseUps;
 } CloseData;
 
-typedef CloseData *CloseDataPtr;
-
 struct ViewData {
 	int16 *_condition;
 	char *_graphicName;
@@ -128,8 +126,6 @@ struct Rule {
 	Rule *_nextRule;
 };
 
-typedef Common::List<Rule *> RuleList;
-
 struct RoomData {
 	uint16 _northDoor;
 	uint16 _southDoor;

engines/lab/resource.cpp

@@ -32,6 +32,7 @@
 
 #include "lab/dispman.h"
 #include "lab/music.h"
+#include "lab/processroom.h"
 #include "lab/resource.h"
 
 namespace Lab {

engines/lab/resource.h

@@ -33,6 +33,8 @@
 
 namespace Lab {
 
+struct ViewData;
+
 enum StaticText {
 	kTextLowerFloor,
 	kTextMiddleFloor,

engines/lab/special.cpp

@@ -42,6 +42,7 @@
 #include "lab/interface.h"
 #include "lab/labsets.h"
 #include "lab/music.h"
+#include "lab/processroom.h"
 #include "lab/resource.h"
 #include "lab/savegame.h"
 #include "lab/utils.h"