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

Don't find scripts from the last loaded world's raw/scripts folder

develop
lethosor 2015-09-26 14:26:13 -04:00
parent b679a0c482
commit fa60ccdd52
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Core.cpp
Unescape Escape View File

@ -469,7 +469,7 @@ void Core::getScriptPaths(std::vector<std::string> *dest)
string df_path = this->p->getPath();
for (auto it = script_paths[0].begin(); it != script_paths[0].end(); ++it)
dest->push_back(*it);
if (df::global::world) {
if (df::global::world && isWorldLoaded()) {
string save = World::ReadWorldFolder();
if (save.size())
dest->push_back(df_path + "/data/save/" + save + "/raw/scripts");

2
scripts/3rdparty/dscorbett vendored

@ -1 +1 @@
Subproject commit 544f890a62622e2c6188991afe61fdf3c0513227
Subproject commit 412f2b283d33a4c63a5bbcfab9c015c488ab6d5d

2
scripts/3rdparty/lethosor vendored

@ -1 +1 @@
Subproject commit e3666a7385ca00565b95f3d7c6d41f6e7955816f
Subproject commit 491c4614fb9b83015815a5784a2ba53ac3f8430f