From 4762811347383c2ef6a013eca643e27176f1c22d Mon Sep 17 00:00:00 2001
From: Filip Maj <filipmaj@gmail.com>
Date: Wed, 30 Aug 2017 19:43:20 -0400
Subject: [PATCH] Fixed global.lua be screwed up by merge.

---
 data/scripts/global.lua | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/data/scripts/global.lua b/data/scripts/global.lua
index 48f2cfe6..1d2e68da 100644
--- a/data/scripts/global.lua
+++ b/data/scripts/global.lua
@@ -71,12 +71,29 @@ CHOCOBO_ULDAH4 = 0x40;
 
 --UTILS
 
+function kickEventContinue(player, actor, trigger, ...)
+	player:kickEvent(actor, trigger, ...);
+	return coroutine.yield("_WAIT_EVENT", player);
+end
+
 function callClientFunction(player, functionName, ...)
-	player:RunEventFunction(functionName, ...);
-	result = coroutine.yield();
+	player:RunEventFunction(functionName, ...);	
+	result = coroutine.yield("_WAIT_EVENT", player);
 	return result;
 end
 
+function wait(seconds)
+	return coroutine.yield("_WAIT_TIME", seconds);
+end
+
+function waitForSignal(signal)
+	return coroutine.yield("_WAIT_SIGNAL", signal);
+end
+
+function sendSignal(signal)
+	GetLuaInstance():OnSignal(signal);
+end
+
 function printf(s, ...)
     if ... then
         print(s:format(...));