From 24d011a289aa5db3693ac9c404f5f5d87a3215d7 Mon Sep 17 00:00:00 2001
From:  <>
Date: Fri, 7 Jul 2017 23:08:58 -0700
Subject: [PATCH] Writing entity brushes overwrites brush texture with
 common/trigger

---
 ReflexToQ3/includes/oopless-parser.cpp | 16 ++++++++++++++--
 ReflexToQ3/includes/oopless-parser.hpp |  4 +++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ReflexToQ3/includes/oopless-parser.cpp b/ReflexToQ3/includes/oopless-parser.cpp
index 94dc062..d6a8a67 100644
--- a/ReflexToQ3/includes/oopless-parser.cpp
+++ b/ReflexToQ3/includes/oopless-parser.cpp
@@ -5,7 +5,7 @@
 #include <iterator>
 using namespace std;
 
-bool is_ebrush(std::vector<std::string> input) {
+bool is_ebrush(const std::vector<std::string> &input) {
 #define KEYWORD_ENTBRUSH1 "type Teleporter"
 #define KEYWORD_ENTBRUSH2 "type JumpPad"
     for (const string &str : input) {
@@ -36,6 +36,18 @@ bool write(const struct TBrush &geometry,
     return ok;
 }
 
+// currently for the specific case to specify trigger to brush entities
+struct TBrush override_textures(struct TBrush x, const char *texture) {
+    struct TBrush output = x;
+    for (struct TFace &z : output.m_Faces) {
+        // prevent appending color infomation to texture file path
+        // may need re-ordering on when to append that.
+        z.hex = string();
+        z.m_Material = texture;
+    }
+    return output;
+}
+
 void write(const vector<string> &entity, 
            ofstream &fo,
            void (*b) (stringstream &, const vector<TPlanePoints> &),
@@ -73,7 +85,7 @@ void write(const vector<string> &entity,
         string line;
         copy(brush.begin(), brush.end(), ostream_iterator<string>(ss, "\n"));
         getline(ss, line); // this both discards the brush keyboard and prevents a crash
-        write(parse_brush<stringstream>(ss), fo, b);
+        write(override_textures(parse_brush<stringstream>(ss), "common/trigger"), fo, b);
     }
     fo << "}" << endl;
 }
diff --git a/ReflexToQ3/includes/oopless-parser.hpp b/ReflexToQ3/includes/oopless-parser.hpp
index 096e9cb..92ccbae 100644
--- a/ReflexToQ3/includes/oopless-parser.hpp
+++ b/ReflexToQ3/includes/oopless-parser.hpp
@@ -10,7 +10,9 @@
 #include <queue>
 #include "EntityConverter.hpp"
 
-bool is_ebrush(std::vector<std::string>);
+bool is_ebrush(const std::vector<std::string>&);
+
+struct TBrush override_textures(struct TBrush, const char*);
 
 bool write(const struct TBrush &, 
            std::ofstream &,