From 438283d0029a6d82e1669b218a2481c5c4ea2dbd Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 25 Nov 2012 21:25:02 +0000
Subject: Added entity minimum speed threshold.

---
 src/core/entity.h | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'src/core/entity.h')

diff --git a/src/core/entity.h b/src/core/entity.h
index 31ed67b..0be81b9 100644
--- a/src/core/entity.h
+++ b/src/core/entity.h
@@ -349,10 +349,19 @@ public:
 	/**
 	 * @brief unset flag
 	 * */
-	inline void unset_flag(Flags flag) {
+	inline void unset_flag(Flags flag)
+	{
 		entity_flags &= ~((unsigned int) flag);
 	}
 
+	/**
+	 * @brief set flags
+	 * */
+	 inline  void set_flags(unsigned int flags)
+	 {
+		 entity_flags = flags;
+	 }
+	 
 	/**
 	 * @brief add an inventory to this entity
 	 * If this entity already has an inventory,
@@ -725,6 +734,14 @@ public:
 		return entity_actioninterface;
 	}
 	
+	/**
+	 * @brief current health, 0 - 100
+	 * */
+	inline const float health() const
+	{
+		return entity_health;
+	}
+	
 	/*----- serializers ----------------------------------------------- */
 
 	/// serialize the entity to a stream
@@ -810,6 +827,9 @@ protected:
 	
 	/// current thrust
 	float			entity_thrust;
+	
+	/// current health
+	float			entity_health;
 		
 	/* target_ variables can be set by the client */
 	
-- 
cgit v1.2.3