Revert "Allowed dfhack.timeout tick events to be queued before a world is loaded."

This reverts commit ecd75e9b3e.
2014-06-28 03:06:19 -04:00 · 2014-06-28 03:06:19 -04:00 · a62b15ccd2
parent 1d07aebdae
commit a62b15ccd2
2 changed files with 6 additions and 2 deletions
--- a/2
+++ b/2
@ -1,8 +1,6 @@
 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,6 +1694,12 @@ 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)
    {