From 5cc39e7c5351b27c4a576a51c8fa44608dfba5e8 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Tue, 27 Mar 2012 06:42:55 +0000
Subject: [PATCH] - added a new type of lua script timer for efficient checking
 of elapsed time

---
 source/glest_game/game/script_manager.cpp | 46 +++++++++++++++++++++--
 source/glest_game/game/script_manager.h   |  4 ++
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/source/glest_game/game/script_manager.cpp b/source/glest_game/game/script_manager.cpp
index e43add55..cfc8f2a1 100644
--- a/source/glest_game/game/script_manager.cpp
+++ b/source/glest_game/game/script_manager.cpp
@@ -141,6 +141,7 @@ TimerTriggerEvent::TimerTriggerEvent() {
 	running = false;
 	startFrame = 0;
 	endFrame = 0;
+	triggerSecondsElapsed = 0;
 }
 
 void TimerTriggerEvent::saveGame(XmlNode *rootNode) {
@@ -155,6 +156,10 @@ void TimerTriggerEvent::saveGame(XmlNode *rootNode) {
 	timerTriggerEventNode->addAttribute("startFrame",intToStr(startFrame), mapTagReplacements);
 //	int endFrame;
 	timerTriggerEventNode->addAttribute("endFrame",intToStr(endFrame), mapTagReplacements);
+
+	if(triggerSecondsElapsed > 0) {
+		timerTriggerEventNode->addAttribute("triggerSecondsElapsed",intToStr(triggerSecondsElapsed), mapTagReplacements);
+	}
 }
 
 void TimerTriggerEvent::loadGame(const XmlNode *rootNode) {
@@ -163,6 +168,9 @@ void TimerTriggerEvent::loadGame(const XmlNode *rootNode) {
 	running = timerTriggerEventNode->getAttribute("running")->getIntValue();
 	startFrame = timerTriggerEventNode->getAttribute("startFrame")->getIntValue();
 	endFrame = timerTriggerEventNode->getAttribute("endFrame")->getIntValue();
+	if(timerTriggerEventNode->hasAttribute("triggerSecondsElapsed") == true) {
+		triggerSecondsElapsed = timerTriggerEventNode->getAttribute("triggerSecondsElapsed")->getIntValue();
+	}
 }
 
 // =====================================================
@@ -262,6 +270,7 @@ void ScriptManager::init(World* world, GameCamera *gameCamera, const XmlNode *ro
 	luaScript.registerFunction(getCellTriggerEventCount, "getCellTriggerEventCount");
 	luaScript.registerFunction(unregisterCellTriggerEvent, "unregisterCellTriggerEvent");
 	luaScript.registerFunction(startTimerEvent, "startTimerEvent");
+	luaScript.registerFunction(startEfficientTimerEvent, "startEfficientTimerEvent");
 	luaScript.registerFunction(resetTimerEvent, "resetTimerEvent");
 	luaScript.registerFunction(stopTimerEvent, "stopTimerEvent");
 	luaScript.registerFunction(getTimerEventSecondsElapsed, "timerEventSecondsElapsed");
@@ -442,7 +451,7 @@ void ScriptManager::onGameOver(bool won) {
 }
 
 void ScriptManager::onTimerTriggerEvent() {
-	if(TimerTriggerEventList.size() <= 0) {
+	if(TimerTriggerEventList.empty() == true) {
 		return;
 	}
 	if(this->rootNode != NULL) {
@@ -461,8 +470,15 @@ void ScriptManager::onTimerTriggerEvent() {
 		if(event.running == true) {
 			if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
 
+			// If using an efficient timer, check if its time to trigger
+			// on the elapsed check
+			if(event.triggerSecondsElapsed > 0) {
+				int elapsed = (world->getFrameCount()-event.startFrame) / GameConstants::updateFps;
+				if(elapsed < event.triggerSecondsElapsed) {
+					continue;
+				}
+			}
 			currentTimerTriggeredEventId = iterMap->first;
-
 			luaScript.beginCall("timerTriggerEvent");
 			luaScript.endCall();
 		}
@@ -470,7 +486,7 @@ void ScriptManager::onTimerTriggerEvent() {
 }
 
 void ScriptManager::onCellTriggerEvent(Unit *movingUnit) {
-	if(CellTriggerEventList.size() <= 0) {
+	if(CellTriggerEventList.empty() == true) {
 		return;
 	}
 	if(this->rootNode != NULL) {
@@ -964,6 +980,23 @@ int ScriptManager::startTimerEvent() {
 	return eventId;
 }
 
+int ScriptManager::startEfficientTimerEvent(int triggerSecondsElapsed) {
+	TimerTriggerEvent trigger;
+	trigger.running = true;
+	//trigger.startTime = time(NULL);
+	trigger.startFrame = world->getFrameCount();
+	//trigger.endTime = 0;
+	trigger.endFrame = 0;
+	trigger.triggerSecondsElapsed = triggerSecondsElapsed;
+
+	int eventId = currentEventId++;
+	TimerTriggerEventList[eventId] = trigger;
+
+	if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d] TimerTriggerEventList.size() = %d, eventId = %d, trigger.startTime = %lld, trigger.endTime = %lld\n",__FILE__,__FUNCTION__,__LINE__,TimerTriggerEventList.size(),eventId,(long long int)trigger.startFrame,(long long int)trigger.endFrame);
+
+	return eventId;
+}
+
 int ScriptManager::resetTimerEvent(int eventId) {
 	int result = 0;
 	if(TimerTriggerEventList.find(eventId) != TimerTriggerEventList.end()) {
@@ -1487,6 +1520,13 @@ int ScriptManager::startTimerEvent(LuaHandle* luaHandle) {
 	return luaArguments.getReturnCount();
 }
 
+int ScriptManager::startEfficientTimerEvent(LuaHandle* luaHandle) {
+	LuaArguments luaArguments(luaHandle);
+	int result = thisScriptManager->startEfficientTimerEvent(luaArguments.getInt(-1));
+	luaArguments.returnInt(result);
+	return luaArguments.getReturnCount();
+}
+
 int ScriptManager::stopTimerEvent(LuaHandle* luaHandle) {
 	LuaArguments luaArguments(luaHandle);
 	int result = thisScriptManager->stopTimerEvent(luaArguments.getInt(-1));
diff --git a/source/glest_game/game/script_manager.h b/source/glest_game/game/script_manager.h
index d21d810d..471da6ba 100644
--- a/source/glest_game/game/script_manager.h
+++ b/source/glest_game/game/script_manager.h
@@ -117,6 +117,8 @@ public:
 	int startFrame;
 	int endFrame;
 
+	int triggerSecondsElapsed;
+
 	void saveGame(XmlNode *rootNode);
 	void loadGame(const XmlNode *rootNode);
 };
@@ -255,6 +257,7 @@ private:
 	int getCellTriggerEventCount(int eventId);
 	void unregisterCellTriggerEvent(int eventId);
 	int startTimerEvent();
+	int startEfficientTimerEvent(int triggerSecondsElapsed);
 	int resetTimerEvent(int eventId);
 	int stopTimerEvent(int eventId);
 	int getTimerEventSecondsElapsed(int eventId);
@@ -346,6 +349,7 @@ private:
 	static int getCellTriggerEventCount(LuaHandle* luaHandle);
 	static int unregisterCellTriggerEvent(LuaHandle* luaHandle);
 	static int startTimerEvent(LuaHandle* luaHandle);
+	static int startEfficientTimerEvent(LuaHandle* luaHandle);
 	static int resetTimerEvent(LuaHandle* luaHandle);
 	static int stopTimerEvent(LuaHandle* luaHandle);
 	static int getTimerEventSecondsElapsed(LuaHandle* luaHandle);