rubenwardy
/
The-NodeBox-Generator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DIR_DELIM warning

master
rubenwardy 2015-07-26 15:02:51 +01:00
parent e121367445
commit 6108bd7a72
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/minetest.cpp
View File

@ -6,12 +6,6 @@
#include <stdlib.h>
#include <fstream>
#ifdef _WIN32
#define DIR_DELIM "\\"
#else
#define DIR_DELIM "/"
#endif
Minetest::Minetest(Configuration *conf):
_conf(conf), minetest_dir(""), minetest_exe("")
{}
@ -22,12 +16,12 @@ bool Minetest::findMinetestDir(std::string path)
std::cerr << "Minetest found at " << path.c_str() << std::endl;
minetest_dir = path;
if (FileExists((path + "bin" DIR_DELIM "minetest"
if (FileExists((path + "bin" + DIR_DELIM + "minetest"
#if _WIN32
".exe"
#endif
).c_str())) {
minetest_exe = path + "bin" DIR_DELIM "minetest"
minetest_exe = path + "bin" + DIR_DELIM + "minetest"
#if _WIN32
".exe"
#endif
@ -74,16 +68,16 @@ bool Minetest::findMinetest(bool editor_is_installed)
path = getSaveLoadDirectory(_conf->get("save_directory"), editor_is_installed);
path = cleanDirectoryPath(path);
if (findMinetestDir(path + ".." DIR_DELIM "minetest" DIR_DELIM) && minetest_exe != "")
if (findMinetestDir(path + ".." + DIR_DELIM + "minetest" + DIR_DELIM) && minetest_exe != "")
return true;
if (findMinetestDir(path + "minetest" DIR_DELIM) && minetest_exe != "")
if (findMinetestDir(path + "minetest" + DIR_DELIM) && minetest_exe != "")
return true;
if (findMinetestDir(path + ".." DIR_DELIM "Minetest" DIR_DELIM) && minetest_exe != "")
if (findMinetestDir(path + ".." + DIR_DELIM + "Minetest" + DIR_DELIM) && minetest_exe != "")
return true;
if (findMinetestDir(path + "Minetest" DIR_DELIM) && minetest_exe != "")
if (findMinetestDir(path + "Minetest" + DIR_DELIM) && minetest_exe != "")
return true;
std::cerr << "Minetest not found!" << std::endl;
@ -92,7 +86,7 @@ bool Minetest::findMinetest(bool editor_is_installed)
bool Minetest::runMod(EditorState *state, const std::string &world)
{
std::string worlddir = minetest_dir + "worlds" DIR_DELIM + world + DIR_DELIM;
std::string worlddir = minetest_dir + "worlds" + DIR_DELIM + world + DIR_DELIM;
std::string modname = state->project->name;
if (DirExists(worlddir.c_str())) {
// Open file
@ -138,10 +132,10 @@ bool Minetest::runMod(EditorState *state, const std::string &world)
CreateDir(cmd);
// Export Mod
std::string mod_to = worlddir + "worldmods" DIR_DELIM + modname;
std::string mod_to = worlddir + "worldmods" + DIR_DELIM + modname;
CreateDir(mod_to);
mod_to = cleanDirectoryPath(mod_to);
export_textures(mod_to + "textures" DIR_DELIM, state);
export_textures(mod_to + "textures" + DIR_DELIM, state);
FileFormat *writer = getFromType(FILE_FORMAT_LUA, state);
save_file(writer, state, mod_to + "init.lua");