From 25bcd92706ce2cd6aee24cfb81e9ff2fd7dd4820 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Tue, 11 Aug 2009 11:49:12 +0000
Subject: misc_model support

---
 src/model/map.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/model/map.h')

diff --git a/src/model/map.h b/src/model/map.h
index 8dc688e..ed0b3e1 100644
--- a/src/model/map.h
+++ b/src/model/map.h
@@ -4,8 +4,8 @@
    the terms of the GNU General Public License version 2
 */
 
-#ifndef __INCLUDED_MODEL_MAP_H__
-#define __INCLUDED_MODEL_MAP_H__
+#ifndef __INCLUDED_MODEL_MAPFILE_H__
+#define __INCLUDED_MODEL_MAPFILE_H__
 
 #include <string>
 #include <vector>
@@ -20,7 +20,7 @@ namespace model
 {
 
 /// class to parse the .map file structure and load geometry data into a model
-class Map
+class MapFile
 {
 
 public:
@@ -32,8 +32,8 @@ public:
 	static Model *load(std::string const &name);
 	
 private:
-	Map();
-	~Map();
+	MapFile();
+	~MapFile();
 	
 	/// tpye definition for a per-material list of Primitives
 	typedef std::map<Material *, Primitives *> Materials;
@@ -180,8 +180,10 @@ private:
 
 	math::Vector3f		map_center;
 	Materials		map_materials;
+
+	bool			warning_q2brush;
 };
 
 }
 
-#endif // __INCLUDED_MODEL_MAP_H__
+#endif // __INCLUDED_MODEL_MAPFILE_H__
-- 
cgit v1.2.3