Allowed dfhack.timeout tick events to be queued before a world is loa…

…ded.
Komodon · Jun 27, 2014 · ecd75e9 · ecd75e9
1 parent 2827861
commit ecd75e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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)
     {