Fixing Linux SCons build.

[xonotic/netradiant.git] / contrib / bobtoolz / DMap.h

diff --git a/contrib/bobtoolz/DMap.h b/contrib/bobtoolz/DMap.h
index 018dbc0f28447701822300c83074b37548ddb208..60f58543ec6beb0f1ecd7019b16b25b14b43ad47 100644 (file)
--- a/contrib/bobtoolz/DMap.h
+++ b/contrib/bobtoolz/DMap.h
@@ -24,35 +24,33 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #if !defined(AFX_DMAP_H__ACAE597A_D26D_49AD_AA69_EDE743DB54FA__INCLUDED_)
 #define AFX_DMAP_H__ACAE597A_D26D_49AD_AA69_EDE743DB54FA__INCLUDED_
 
+#include "DEntity.h"
+
 #if _MSC_VER > 1000
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <list>
-
-class DEntity;
-
-class DMap  
+class DMap
 {
 public:
        static void RebuildEntity(DEntity* ent);
 
        void ResetTextures( const char* textureName, float fScale[2],      float fShift[2],      int rotation, const char* newTextureName, int bResetTextureName,  int bResetScale[2],  int bResetShift[2],  int bResetRotation);
-       void LoadAll(bool bLoadPatches = false);
+       void LoadAll(bool bLoadPatches = FALSE);
        void BuildInRadiant(bool bAllowDestruction);
        int m_nNextEntity;
        DEntity* GetWorldSpawn();
        void ClearEntities();
 
-       DEntity* GetEntityForID(int ID);
+       DEntity* DMap::GetEntityForID(int ID);
        DEntity* AddEntity(char* classname = "worldspawn", int ID = -1);
 
-       std::list<DEntity*> entityList;
+       list<DEntity*> entityList;
 
        DMap();
        virtual ~DMap();
 
-       int FixBrushes();
+       int FixBrushes(bool rebuild);
 };
 
 #endif // !defined(AFX_DMAP_H__ACAE597A_D26D_49AD_AA69_EDE743DB54FA__INCLUDED_)