diff options
| author | Stijn Buys <ingar@osirion.org> | 2009-08-11 11:49:12 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2009-08-11 11:49:12 +0000 |
| commit | 25bcd92706ce2cd6aee24cfb81e9ff2fd7dd4820 (patch) | |
| tree | 19e71f817ffc36247f4db718454f3634904284b0 /src/model/map.h | |
| parent | a2ae048571310e80ba7502f1d81b5dd2eb1e38fa (diff) | |
misc_model support
Diffstat (limited to 'src/model/map.h')
| -rw-r--r-- | src/model/map.h | 14 |
1 files changed, 8 insertions, 6 deletions
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__ |