From fadf248892eae825b57d283032594ed924d8dbea Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 28 Nov 2011 10:33:47 +0200
Subject: Handle ActiveBlockModifier intervals properly, down to 1s

---
 src/environment.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/environment.h')

diff --git a/src/environment.h b/src/environment.h
index a3418dbd4..a8b51ae3f 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -118,6 +118,16 @@ public:
 			u32 active_object_count, u32 active_object_count_wider){};
 };
 
+struct ABMWithState
+{
+	ActiveBlockModifier *abm;
+	float timer;
+
+	ABMWithState(ActiveBlockModifier *abm_):
+		abm(abm_)
+	{}
+};
+
 /*
 	List of active blocks, used by ServerEnvironment
 */
@@ -329,7 +339,7 @@ private:
 	u32 m_game_time;
 	// A helper variable for incrementing the latter
 	float m_game_time_fraction_counter;
-	core::list<ActiveBlockModifier*> m_abms;
+	core::list<ABMWithState> m_abms;
 };
 
 #ifndef SERVER
-- 
cgit v1.2.3