From d09a1be33a647aedc12ce5ddcb7ea4ee23a75c8c Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Wed, 30 Jul 2008 16:00:49 +0000 Subject: various minor issues: ESC closing chat, g_autolevel --- src/model/map.cc | 9 +++++++++ src/model/material.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src/model') diff --git a/src/model/map.cc b/src/model/map.cc index c68bb1d..2930021 100644 --- a/src/model/map.cc +++ b/src/model/map.cc @@ -479,6 +479,10 @@ void Map::make_brushface(Plane *face) } else if (face->texture().compare("common/entity_thirdy_dark") == 0) { material |= Material::Tertiary; material |= Material::Dark; + + } else if (face->texture().compare("common/engine") == 0) { + color.assign(1, 0, 0); + material |= Material::Engine; } // translate surface flags to materials @@ -487,6 +491,11 @@ void Map::make_brushface(Plane *face) if ((face->surface_flags() & 1) == 1) { material |= Material::Light; } + + // surface flag 2 engine + if ((face->surface_flags() & 2) == 2) { + material |= Material::Engine; + } // find the list if primitives for the current material, allocate a new one if necessary Primitives *primitives = 0; diff --git a/src/model/material.h b/src/model/material.h index 02ae58f..bdfee68 100644 --- a/src/model/material.h +++ b/src/model/material.h @@ -13,7 +13,7 @@ namespace model class Material { public: - enum Flags { None=0, Primary=1, Secondary=2, Tertiary=3, Dark=4, Light=8, Reflective=16 }; + enum Flags { None=0, Primary=1, Secondary=2, Tertiary=3, Dark=4, Light=8, Engine=16}; }; } -- cgit v1.2.3