From f6a00d4a38c98a51f156f30d9bbd30f54dc6ccad Mon Sep 17 00:00:00 2001 From: oranges Date: Sat, 28 Oct 2017 11:33:33 +1300 Subject: [PATCH] Merge pull request #32130 from Cyberboss/call_security [s] Makes ImmediateInvokeAsync a world proc --- code/__DEFINES/callbacks.dm | 2 +- code/datums/callback.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/callbacks.dm b/code/__DEFINES/callbacks.dm index 18059a6083..126ef1ea1c 100644 --- a/code/__DEFINES/callbacks.dm +++ b/code/__DEFINES/callbacks.dm @@ -1,4 +1,4 @@ #define GLOBAL_PROC "some_magic_bullshit" #define CALLBACK new /datum/callback -#define INVOKE_ASYNC ImmediateInvokeAsync +#define INVOKE_ASYNC world.ImmediateInvokeAsync diff --git a/code/datums/callback.dm b/code/datums/callback.dm index 0fc500e467..88d9427301 100644 --- a/code/datums/callback.dm +++ b/code/datums/callback.dm @@ -56,7 +56,7 @@ if (length(args) > 2) arguments = args.Copy(3) -/proc/ImmediateInvokeAsync(thingtocall, proctocall, ...) +/world/proc/ImmediateInvokeAsync(thingtocall, proctocall, ...) set waitfor = FALSE if (!thingtocall)