aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 09:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2015-12-30 00:10:51 +01:00
commit 7247cba9eb
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp
View file

@ -90,7 +90,7 @@ int main(int argc, char *argv[])
script += testMission->generateDotScript(); script += testMission->generateDotScript();
script = script.replace(NL.c_str(), "\n"); script = script.replace(NL.c_str(), "\n");
char *tmp = ::getenv("TEMP"); const char *tmp = ::getenv("TEMP");
FILE *fp = ::fopen((string(tmp)+"/compiled_mission.script").c_str(), "w"); FILE *fp = ::fopen((string(tmp)+"/compiled_mission.script").c_str(), "w");
::fwrite(script.data(), script.size(), 1, fp); ::fwrite(script.data(), script.size(), 1, fp);
@ -98,7 +98,8 @@ int main(int argc, char *argv[])
// TODO: set diff program in .cfg // TODO: set diff program in .cfg
std::string compareApp = ""; std::string compareApp = "";
sint error = system(compareApp+(string(" ")+string(tmp)+"/compiled_mission.script test_compilateur.script").c_str()); std::string command = NLMISC::toString("%s %s/compiled_mission.script test_compilateur.script", compareApp.c_str(), tmp);
sint error = system(command.c_str());
if (error) if (error)
nlwarning("'%s' failed with error code %d", "", error); nlwarning("'%s' failed with error code %d", "", error);