Merge remote-tracking branch 'origin/scriptOrganization' into scriptOrganization

2014-06-27 06:50:59 -04:00 · 2014-06-27 06:50:59 -04:00 · 5539982ef6
parent 9a8b1d04fa ecd75e9b3e
commit 5539982ef6
2 changed files with 2 additions and 6 deletions
--- a/2
+++ b/2
@ -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
--- 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)
    {