mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-01-24 09:16:48 +00:00
Code Issues Releases Wiki Activity

Fix crash added with last commit, thx KS-10 for pointing

Browse source
This commit is contained in:
fgenesis 2012-07-23 05:06:01 +02:00
parent 9c76fa7ed4
commit 9e4fe3809e
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Aquaria/ScriptInterface.cpp
View file

@ -8952,7 +8952,7 @@ void ScriptInterface::shutdown()
Script *ScriptInterface::openScript(const std::string &file, bool ignoremissing /* = false */) Script *ScriptInterface::openScript(const std::string &file, bool ignoremissing /* = false */)
{ {
std::string realFile = localisePath(file, dsq->mod.isActive() ? dsq->mod.getPath() : ""); std::string realFile = localisePathInternalModpath(file);
realFile = core->adjustFilenameCase(realFile); realFile = core->adjustFilenameCase(realFile);
bool loadedScript = false; bool loadedScript = false;

2
BBGE/Localization.cpp
View file

@ -62,6 +62,8 @@ std::string localisePath(const std::string &path, const std::string& modpath /*
{ {
if (s_locale.empty() || s_locale == "-") if (s_locale.empty() || s_locale == "-")
return path; return path;
if(path.length() < modpath.length())
return path;
const std::string fname = path.substr(modpath.length()); const std::string fname = path.substr(modpath.length());