MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

develop
expwnent 2014-06-27 06:50:59 -04:00
parent 9a8b1d04fa ecd75e9b3e
commit 5539982ef6
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
Unescape Escape View File

@ -1,6 +1,8 @@
DFHack future DFHack future
Internals: Internals:
LuaApi
support queuing dfhack.timeout events before a world is loaded.
New scripts: New scripts:
add-syndrome.lua add-syndrome.lua
add a syndrome to a unit. many configurable options add a syndrome to a unit. many configurable options

6
library/LuaTools.cpp
Unescape Escape View File

@ -1694,12 +1694,6 @@ int dfhack_timeout(lua_State *L)
luaL_checktype(L, 3, LUA_TFUNCTION); luaL_checktype(L, 3, LUA_TFUNCTION);
lua_settop(L, 3); lua_settop(L, 3);
if (mode > 0 && !Core::getInstance().isWorldLoaded())
{
lua_pushnil(L);
return 1;
}
// Compute timeout value // Compute timeout value
switch (mode) switch (mode)
{ {