From ecd75e9b3e1191eee485c596d4c630bb7ddb48d2 Mon Sep 17 00:00:00 2001
From: expwnent <null@nowhere.com>
Date: Fri, 27 Jun 2014 06:49:29 -0400
Subject: [PATCH] Allowed dfhack.timeout tick events to be queued before a
 world is loaded.

---
 NEWS                 | 2 ++
 library/LuaTools.cpp | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index e240a26ab..a491c5235 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 DFHack future
 
   Internals:
+   LuaApi
+    support queuing dfhack.timeout events before a world is loaded.
   New scripts:
    add-syndrome.lua
     add a syndrome to a unit. many configurable options
diff --git a/library/LuaTools.cpp b/library/LuaTools.cpp
index 392659bc8..b70a33b2a 100644
--- a/library/LuaTools.cpp
+++ b/library/LuaTools.cpp
@@ -1694,12 +1694,6 @@ int dfhack_timeout(lua_State *L)
     luaL_checktype(L, 3, LUA_TFUNCTION);
     lua_settop(L, 3);
 
-    if (mode > 0 && !Core::getInstance().isWorldLoaded())
-    {
-        lua_pushnil(L);
-        return 1;
-    }
-
     // Compute timeout value
     switch (mode)
     {