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

Merge remote-tracking branch 'lethosor/global-onload'

develop
expwnent 2014-09-16 16:53:31 -04:00
parent d223655dc7 328b95c1ec
commit 3e882f35b3
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
Unescape Escape View File

@ -1,4 +1,7 @@
DFHack future DFHack future
Internals:
- support for global onLoadWorld.init and onUnloadWorld.init files,
called when loading and unloading a world
DFHack 0.40.11-r1 DFHack 0.40.11-r1

2
library/Core.cpp
Unescape Escape View File

@ -1435,9 +1435,11 @@ static void handleLoadAndUnloadScripts(Core* core, color_ostream& out, state_cha
std::string rawFolder = "data" + separator + "save" + separator + (df::global::world->cur_savegame.save_dir) + separator + "raw" + separator; std::string rawFolder = "data" + separator + "save" + separator + (df::global::world->cur_savegame.save_dir) + separator + "raw" + separator;
switch(event) { switch(event) {
case SC_WORLD_LOADED: case SC_WORLD_LOADED:
core->loadScriptFile(out, "onLoadWorld.init", true);
core->loadScriptFile(out, rawFolder + "onLoad.init", true); core->loadScriptFile(out, rawFolder + "onLoad.init", true);
break; break;
case SC_WORLD_UNLOADED: case SC_WORLD_UNLOADED:
core->loadScriptFile(out, "onUnloadWorld.init", true);
core->loadScriptFile(out, rawFolder + "onUnload.init", true); core->loadScriptFile(out, rawFolder + "onUnload.init", true);
break; break;
default: default: