disable client prediction by default, add --without-client option to configure

3 files changed, 7 insertions, 1 deletions

diff --git a/src/model/engine.cc b/src/model/engine.cc
index 1a89ea2..7c8d117 100644
--- a/src/model/engine.cc
+++ b/src/model/engine.cc
@@ -16,6 +16,8 @@ Engine::Engine() :
 	engine_location()
 {
 	engine_radius = 1.0f;
+	engine_flare = 0;
+	engine_color.assign(1.0f, 0.0f, 0.0f , 1.0f);
 }
 
 Engine::Engine(math::Vector3f const & location) :
diff --git a/src/model/engine.h b/src/model/engine.h
index 5254973..569eb4e 100644
--- a/src/model/engine.h
+++ b/src/model/engine.h
@@ -23,6 +23,8 @@ public:
 	
 	inline math::Vector3f const & location() const { return engine_location; }
 
+	inline math::Color const & color() const { return engine_color; }
+
 	inline float radius() const { return engine_radius; }
 
 	inline unsigned int flare() const { return engine_flare; }
diff --git a/src/model/map.cc b/src/model/map.cc
index 6769ba8..39e2b9c 100644
--- a/src/model/map.cc
+++ b/src/model/map.cc
@@ -138,7 +138,9 @@ Model * Map::load(std::string const &name)
 			}  else if (mapfile.got_key_int("flare", engine->engine_flare)) {
 				continue;
 
-			}
+			} else if (mapfile.got_key_color("_color", engine->engine_color)) {
+				continue;
+			} 
 		}
 	}