mirror of
https://bitbucket.org/Ioncannon/project-meteor-server.git
synced 2025-04-25 14:17:46 +00:00
Fixed global.lua be screwed up by merge.
This commit is contained in:
parent
7e4fc52b9e
commit
4762811347
1 changed files with 19 additions and 2 deletions
|
@ -71,12 +71,29 @@ CHOCOBO_ULDAH4 = 0x40;
|
||||||
|
|
||||||
--UTILS
|
--UTILS
|
||||||
|
|
||||||
|
function kickEventContinue(player, actor, trigger, ...)
|
||||||
|
player:kickEvent(actor, trigger, ...);
|
||||||
|
return coroutine.yield("_WAIT_EVENT", player);
|
||||||
|
end
|
||||||
|
|
||||||
function callClientFunction(player, functionName, ...)
|
function callClientFunction(player, functionName, ...)
|
||||||
player:RunEventFunction(functionName, ...);
|
player:RunEventFunction(functionName, ...);
|
||||||
result = coroutine.yield();
|
result = coroutine.yield("_WAIT_EVENT", player);
|
||||||
return result;
|
return result;
|
||||||
end
|
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, ...)
|
function printf(s, ...)
|
||||||
if ... then
|
if ... then
|
||||||
print(s:format(...));
|
print(s:format(...));
|
||||||
|
|
Loading…
Add table
Reference in a new issue