C4Object: Move C4Def.h dep out of header

C4Def is only ever used as a pointer inside C4Object.h, so we don't need
to include C4Def.h from it.

src/control/C4Control.cpp

@@ -37,11 +37,13 @@
 #include <C4GameMessage.h>
 #include <C4Landscape.h>
 #include <C4Game.h>
+#include "game/C4GameScript.h"
 #include <C4PlayerList.h>
 #include <C4GameObjects.h>
 #include <C4GameControl.h>
 #include <C4ScriptGuiWindow.h>
 #include "gui/C4MessageInput.h"
+#include "object/C4Def.h"
 #include "object/C4DefList.h"
 
 #ifndef NOAULDEBUG

src/control/C4PlayerControl.cpp

@@ -32,6 +32,7 @@
 #include "C4Viewport.h"
 #include "C4Object.h"
 #include "C4ObjectMenu.h"
+#include "script/C4Aul.h"
 
 #include <algorithm>
 

src/control/C4RoundResults.cpp

@@ -20,6 +20,7 @@
 
 #include <C4Player.h>
 #include <C4Game.h>
+#include "object/C4Def.h"
 #include <C4Object.h>
 #include <C4PlayerList.h>
 #include <C4GameObjects.h>

src/game/C4Game.cpp

@@ -21,6 +21,7 @@
 #include <C4Game.h>
 
 #include <C4AulDebug.h>
+#include "object/C4Def.h"
 #include <C4DefList.h>
 #include <C4Effect.h>
 #include <C4FileMonitor.h>

src/game/C4Viewport.cpp

@@ -22,6 +22,7 @@
 
 #include <C4ViewportWindow.h>
 #include <C4Console.h>
+#include "object/C4Def.h"
 #include <C4Object.h>
 #include <C4FullScreen.h>
 #include <C4Stat.h>

src/gui/C4GameMessage.cpp

@@ -20,6 +20,7 @@
 #include <C4Include.h>
 #include <C4GameMessage.h>
 
+#include "object/C4Def.h"
 #include <C4Object.h>
 #include <C4GraphicsResource.h>
 #include <C4Player.h>

src/gui/C4Menu.cpp

@@ -20,6 +20,7 @@
 #include <C4Include.h>
 #include <C4Menu.h>
 
+#include "object/C4Def.h"
 #include <C4DefList.h>
 #include <C4Object.h>
 #include <C4Viewport.h>

src/gui/C4MouseControl.cpp

@@ -21,6 +21,7 @@
 #include <C4MouseControl.h>
 
 #include <C4Viewport.h>
+#include "object/C4Def.h"
 #include <C4Object.h>
 #include <C4Application.h>
 #include <C4FullScreen.h>

src/gui/C4ScriptGuiWindow.cpp

@@ -30,6 +30,7 @@
 #include <C4ScriptGuiWindow.h>
 
 #include <C4Application.h>
+#include "object/C4Def.h"
 #include <C4DefList.h>
 #include <C4GraphicsSystem.h>
 #include <C4GraphicsResource.h>

src/landscape/C4Landscape.cpp

@@ -44,6 +44,7 @@
 #include "landscape/C4Weather.h"
 #include "lib/C4Random.h"
 #include "lib/StdColors.h"
+#include "object/C4Def.h"
 #include "object/C4FindObject.h"
 #include "object/C4GameObjects.h"
 

src/landscape/C4Map.h

@@ -33,10 +33,7 @@ public:
 	void Create(CSurface8 *sfcMap,
 	            C4SLandscape &rLScape, C4TextureMap &rTexMap,
 	            bool fLayers=false, int32_t iPlayerNum=1);
-	bool Load(BYTE **pbypBuffer,
-	          int32_t &rBufWdt, int32_t &rMapWdt, int32_t &rMapHgt,
-	          C4Group &hGroup, const char *szEntryName,
-	          C4TextureMap &rTexMap);
+
 protected:
 	void Reset();
 	void SetPix(int32_t x, int32_t y, BYTE col);

src/landscape/C4Particles.cpp

@@ -23,6 +23,7 @@
 
 #ifndef USE_CONSOLE
 // headers for particle execution
+#include "script/C4Aul.h"
 #include <C4Application.h>
 #include <C4Value.h>
 #include <C4ValueArray.h>

src/landscape/C4SolidMask.cpp

@@ -19,6 +19,7 @@
 #include <C4Include.h>
 #include <C4SolidMask.h>
 
+#include "object/C4Def.h"
 #include <C4Object.h>
 #include <C4Landscape.h>
 #include <C4Game.h>

src/object/C4Command.cpp

@@ -20,6 +20,7 @@
 #include <C4Include.h>
 #include <C4Command.h>
 
+#include "object/C4Def.h"
 #include <C4DefList.h>
 #include <C4Object.h>
 #include <C4ObjectCom.h>

src/object/C4DefGraphics.cpp

@@ -18,6 +18,7 @@
 #include <C4Include.h>
 #include <C4DefGraphics.h>
 
+#include "object/C4Def.h"
 #include <C4DefList.h>
 #include <C4Object.h>
 #include <C4ObjectInfo.h>

src/object/C4FindObject.cpp

@@ -16,6 +16,7 @@
 #include <C4Include.h>
 #include <C4FindObject.h>
 
+#include "object/C4Def.h"
 #include <C4DefList.h>
 #include <C4Object.h>
 #include <C4Game.h>

src/object/C4GameObjects.cpp

@@ -20,6 +20,7 @@
 #include <C4GameObjects.h>
 
 #include <C4Effect.h>
+#include "object/C4Def.h"
 #include <C4Object.h>
 #include <C4ObjectCom.h>
 #include <C4Physics.h>

src/object/C4MeshAnimation.cpp

@@ -15,6 +15,7 @@
  */
 
 #include "C4Include.h"
+#include "script/C4Aul.h"
 #include "C4MeshAnimation.h"
 #include "C4Object.h"
 #include "C4ValueArray.h"

src/object/C4Movement.cpp

@@ -18,6 +18,7 @@
 /* Object motion, collision, friction */
 
 #include <C4Include.h>
+#include "object/C4Def.h"
 #include <C4Object.h>
 
 #include <C4Effect.h>

src/object/C4Object.cpp

@@ -21,6 +21,7 @@
 #include <C4Object.h>
 
 #include <C4AulExec.h>
+#include "object/C4Def.h"
 #include <C4DefList.h>
 #include <C4Effect.h>
 #include <C4ObjectInfo.h>
@@ -4469,6 +4470,11 @@ void C4Object::UnSelect()
 	Call(PSF_CrewSelection, &C4AulParSet(true));
 }
 
+void C4Object::GetViewPos(float & riX, float & riY, float tx, float ty, const C4Facet & fctViewport) const       // get position this object is seen at (for given scroll)
+{
+	if (Category & C4D_Parallax) GetViewPosPar(riX, riY, tx, ty, fctViewport); else { riX = float(GetX()); riY = float(GetY()); }
+}
+
 bool C4Object::GetDrawPosition(const C4TargetFacet & cgo,
 	float & resultx, float & resulty, float & resultzoom) const
 {
@@ -4933,6 +4939,15 @@ bool C4Object::CanConcatPictureWith(C4Object *pOtherObject) const
 	return true;
 }
 
+bool C4Object::IsMoveableBySolidMask(int ComparisonPlane) const
+{
+	return (Status == C4OS_NORMAL)
+		&& !(Category & C4D_StaticBack)
+		&& (ComparisonPlane < GetPlane())
+		&& !Contained
+		;
+}
+
 void C4Object::UpdateScriptPointers()
 {
 	if (pEffects)

src/object/C4Object.h

@@ -20,16 +20,16 @@
 #ifndef INC_C4Object
 #define INC_C4Object
 
-#include "C4Facet.h"
-#include "C4Id.h"
-#include "C4Def.h"
-#include "C4Sector.h"
-#include "C4Value.h"
-#include "C4Particles.h"
-#include "C4PropList.h"
-#include "C4ObjectPtr.h"
-#include "StdMesh.h"
-#include <C4GameScript.h>
+#include "game/C4GameScript.h"
+#include "graphics/C4Facet.h"
+#include "landscape/C4Particles.h"
+#include "lib/StdMesh.h"
+#include "object/C4Id.h"
+#include "object/C4ObjectPtr.h"
+#include "object/C4Sector.h"
+#include "object/C4Shape.h"
+#include "script/C4PropList.h"
+#include "script/C4Value.h"
 
 /* Object status */
 
@@ -359,8 +359,7 @@ public:
 
 	bool DoSelect(); // cursor callback if not disabled
 	void UnSelect(); // unselect callback
-	void GetViewPos(float &riX, float &riY, float tx, float ty, const C4Facet &fctViewport) const       // get position this object is seen at (for given scroll)
-	{ if (Category & C4D_Parallax) GetViewPosPar(riX, riY, tx, ty, fctViewport); else { riX=float(GetX()); riY=float(GetY()); } }
+	void GetViewPos(float &riX, float &riY, float tx, float ty, const C4Facet &fctViewport) const;
 	void GetViewPosPar(float &riX, float &riY, float tx, float ty, const C4Facet &fctViewport) const;   // get position this object is seen at, calculating parallaxity
 	bool PutAwayUnusedObject(C4Object *pToMakeRoomForObject); // either directly put the least-needed object away, or add a command to do it - return whether successful
 
@@ -385,14 +384,7 @@ public:
 
 	bool CanConcatPictureWith(C4Object *pOtherObject) const; // return whether this object should be grouped with the other in activation lists, contents list, etc.
 
-	bool IsMoveableBySolidMask(int ComparisonPlane) const
-	{
-		return (Status == C4OS_NORMAL)
-		       && !(Category & C4D_StaticBack)
-		       && (ComparisonPlane < GetPlane())
-		       && !Contained
-		       ;
-	}
+	bool IsMoveableBySolidMask(int ComparisonPlane) const;
 
 	StdStrBuf GetNeededMatStr() const;
 

src/object/C4ObjectCom.cpp

@@ -21,6 +21,7 @@
 #include <C4ObjectCom.h>
 
 #include <C4Effect.h>
+#include "object/C4Def.h"
 #include <C4Object.h>
 #include <C4Physics.h>
 #include <C4Command.h>

src/object/C4ObjectInfo.cpp

@@ -20,6 +20,7 @@
 #include <C4Include.h>
 #include <C4ObjectInfo.h>
 
+#include "object/C4Def.h"
 #include <C4DefList.h>
 #include <C4Random.h>
 #include <C4Components.h>

src/object/C4ObjectInfoList.cpp

@@ -20,6 +20,7 @@
 #include <C4Include.h>
 #include <C4ObjectInfoList.h>
 
+#include "object/C4Def.h"
 #include <C4DefList.h>
 #include <C4ObjectInfo.h>
 #include <C4Components.h>

src/object/C4ObjectList.cpp

@@ -20,6 +20,7 @@
 #include <C4Include.h>
 #include <C4ObjectList.h>
 
+#include "object/C4Def.h"
 #include <C4DefList.h>
 #include <C4Object.h>
 #include <C4Application.h>

src/object/C4ObjectMenu.cpp

@@ -20,6 +20,7 @@
 #include "C4ObjectMenu.h"
 
 #include "C4Control.h"
+#include "object/C4Def.h"
 #include "C4Object.h"
 #include "C4ObjectCom.h"
 #include "C4Player.h"

src/player/C4Player.cpp

@@ -21,6 +21,7 @@
 #include <C4Player.h>
 
 #include <C4Application.h>
+#include "object/C4Def.h"
 #include <C4DefList.h>
 #include <C4Object.h>
 #include <C4ObjectInfo.h>

src/script/C4AulDebug.cpp

@@ -22,6 +22,7 @@
 #include <C4Game.h>
 #include <C4MessageInput.h>
 #include <C4Log.h>
+#include "object/C4Def.h"
 #include <C4Object.h>
 #include "C4AulExec.h"
 

src/script/C4AulExec.cpp

@@ -26,6 +26,8 @@
 #include <C4Game.h>
 #include <C4Log.h>
 #include <C4Record.h>
+#include "object/C4Def.h"
+#include "script/C4ScriptHost.h"
 #include <algorithm>
 
 C4AulExec AulExec;

src/script/C4Effect.cpp

@@ -21,9 +21,11 @@
 #include <C4Include.h>
 #include <C4Effect.h>
 
+#include "object/C4Def.h"
 #include <C4DefList.h>
 #include <C4Object.h>
 #include <C4Game.h>
+#include "script/C4Aul.h"
 
 void C4Effect::AssignCallbackFunctions()
 {

src/script/C4PropList.cpp

@@ -17,6 +17,8 @@
 
 #include <C4Include.h>
 #include <C4PropList.h>
+
+#include "script/C4Aul.h"
 #include <C4GameObjects.h>
 #include <C4Game.h>
 #include <C4Object.h>

src/script/C4Value.cpp

@@ -18,10 +18,12 @@
 #include <C4Value.h>
 
 #include <C4AulExec.h>
+#include "object/C4Def.h"
 #include <C4DefList.h>
 #include <C4StringTable.h>
 #include <C4ValueArray.h>
 #include <C4Game.h>
+#include "game/C4GameScript.h"
 #include <C4GameObjects.h>
 #include <C4Object.h>
 #include <C4Log.h>