Tiny header cleanup

Aquaria/CurrentRender.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #include "GridRender.h"
 #include "RenderBase.h"
+#include "Path.h"
+#include "Game.h"
 
 #include "../BBGE/AfterEffect.h"
 

Aquaria/Game.h

@@ -368,36 +368,6 @@ typedef std::vector<QuadList> QuadArray;
 
 typedef std::vector<Element*> ElementUpdateList;
 
-// Note: although this is a bitmask, only one of these values may be set at a time!
-// This is because GridRender and most Lua scripts check via ==, not for bits set (Lua 5.1 doesn't have bit ops)
-enum ObsType
-{
-	OT_EMPTY		= 0x00,
-
-	// immutable
-	OT_BLACK		= 0x01,
-	OT_BLACKINVIS	= 0x02,  // same as OT_BLACK, but not drawn
-	OT_MASK_BLACK	= OT_BLACK | OT_BLACKINVIS,
-
-	// set by tiles
-	OT_INVISIBLE	= 0x04,
-	OT_INVISIBLEIN	= 0x08,
-	OT_HURT			= 0x10,
-
-	// set by entities
-	OT_INVISIBLEENT = 0x20,
-
-	// mask for all bits that block
-	OT_BLOCKING = OT_MASK_BLACK | OT_INVISIBLE | OT_INVISIBLEIN | OT_HURT | OT_INVISIBLEENT,
-
-	// free for use, not colliding by default
-	OT_USER1 = 0x40,
-	OT_USER2 = 0x80,
-	OT_USER_MASK = OT_USER1 | OT_USER2,
-
-	OT_OUTOFBOUNDS = 0xff
-};
-
 struct EntitySaveData
 {
 public:

Aquaria/GameEnums.h

@@ -2,6 +2,37 @@
 #define GAMEENUMS_H
 
 
+// Note: although this is a bitmask, only one of these values may be set at a time!
+// This is because GridRender and most Lua scripts check via ==, not for bits set (Lua 5.1 doesn't have bit ops)
+enum ObsType
+{
+	OT_EMPTY		= 0x00,
+
+	// immutable
+	OT_BLACK		= 0x01,
+	OT_BLACKINVIS	= 0x02,  // same as OT_BLACK, but not drawn
+	OT_MASK_BLACK	= OT_BLACK | OT_BLACKINVIS,
+
+	// set by tiles
+	OT_INVISIBLE	= 0x04,
+	OT_INVISIBLEIN	= 0x08,
+	OT_HURT			= 0x10,
+
+	// set by entities
+	OT_INVISIBLEENT = 0x20,
+
+	// mask for all bits that block
+	OT_BLOCKING = OT_MASK_BLACK | OT_INVISIBLE | OT_INVISIBLEIN | OT_HURT | OT_INVISIBLEENT,
+
+	// free for use, not colliding by default
+	OT_USER1 = 0x40,
+	OT_USER2 = 0x80,
+	OT_USER_MASK = OT_USER1 | OT_USER2,
+
+	OT_OUTOFBOUNDS = 0xff
+};
+
+
 enum WorldMapRevealMethod
 {
 	REVEAL_UNSPECIFIED = -1,

Aquaria/GridRender.h

@@ -21,11 +21,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef GRIDRENDER_H
 #define GRIDRENDER_H
 
+#include "GameEnums.h"
 #include "../BBGE/Quad.h"
-
+#include "ActionMapper.h"
-#include "Game.h"
 
 class GemMover;
+struct MinimapIcon;
+struct WorldMapTile;
+struct GemData;
+class AquariaMenuItem;
+class BitmapText;
 
 class GridRender : public RenderObject
 {

Aquaria/PathRender.cpp

@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #include "GridRender.h"
 #include "RenderBase.h"
+#include "Game.h"
 
 PathRender::PathRender() : RenderObject()
 {

Aquaria/SteamRender.cpp

@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "GridRender.h"
 #include "RenderBase.h"
 #include "../BBGE/AfterEffect.h"
+#include "Game.h"
 
 SteamRender::SteamRender() : RenderObject()
 {