Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-07-30 16:00:49 +0000
committerStijn Buys <ingar@osirion.org>2008-07-30 16:00:49 +0000
commitd09a1be33a647aedc12ce5ddcb7ea4ee23a75c8c (patch)
tree8fe9d8778223e22e8c957b59c51bccabb98d2b94 /src/model/map.cc
parentad436de3a520fb2469dafe23afe03dd0afe8d189 (diff)
various minor issues: ESC closing chat, g_autolevel
Diffstat (limited to 'src/model/map.cc')
-rw-r--r--src/model/map.cc9
1 files changed, 9 insertions, 0 deletions
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;