Cleaned up model::Mapfile axis related keys in the map reader, added warning messages where approriate. Support for multiple particle systems in render::ParticleScript. Cleaned up render::ParticleScript member variable names. Added support for axis related keys and scale key in particle scripts.

1 files changed, 9 insertions, 0 deletions

diff --git a/src/model/mapfile.h b/src/model/mapfile.h
index 7ee47d3..a12e295 100644
--- a/src/model/mapfile.h
+++ b/src/model/mapfile.h
@@ -105,6 +105,9 @@ private:
 	bool got_key_angle(const char * keylabel, float & f);
 
 	bool got_key_vector3f(const char * keylabel, math::Vector3f & v);
+	
+	/// check if the last read key is one of the axis related keys (angle, angles, pitch, yaw, roll)
+	bool got_key_axis(math::Axis &axis);
 
 
 	/// return the number of lines read so far
@@ -152,6 +155,12 @@ private:
 	
 	/// print 'depricated key' warning message to the console
 	void warn_depricated() const;
+	
+	/// print a generic error message
+	void unknown_error(const char *text = 0) const;
+	
+	/// print a generic error message
+	void unknown_error(const std::string &text) const;
 
 	/// list of planes for the current brush
 	std::vector<Face *>	planes;