Futuray-pgm
/
voxelands
forked from oerkki/voxelands
1
1
Fork 0
Code Pull Requests Activity

Merge branch 'next' into 'next' 

fix deleting map/world data on Windows

This now succeeds in both deleting the map and all world/player data, as well as simply clearing the map.

See merge request !13
This commit is contained in:
darkrose 2015-06-11 06:32:47 +00:00
parent d37095ad4b d8df2f28b6
commit dbb0cd81b0
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/filesys.cpp
View File

@ -148,27 +148,34 @@ bool RecursiveDelete(std::string path)
{
std::cerr<<"Removing \""<<path<<"\""<<std::endl;
// experiments
if (DeleteFile(path.c_str()))
return true;
DWORD attributes = GetFileAttributes(path.c_str());
// This silly function needs a double-null terminated string...
// Well, we'll just make sure it has at least two, then.
path += "\0\0";
SHFILEOPSTRUCT sfo;
sfo.hwnd = NULL;
sfo.wFunc = FO_DELETE;
sfo.pFrom = path.c_str();
sfo.pTo = NULL;
sfo.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOCONFIRMMKDIR;
int r = SHFileOperation(&sfo);
if(r != 0)
std::cerr<<"SHFileOperation returned "<<r<<std::endl;
//return (r == 0);
// Delete if it's a file, or call recursive delete if a directory
if(attributes == INVALID_FILE_ATTRIBUTES) {
std::cerr<<"Could not remove \""<<path<<"\""<<std::endl;
return false;
} else {
if(attributes == FILE_ATTRIBUTE_DIRECTORY) {
std::vector<DirListNode> dir_list = GetDirListing(path);
for(int i = 0; i < dir_list.size(); i++) {
DirListNode &node = dir_list[i];
std::string fpath = path + DIR_DELIM + node.name;
if(!RecursiveDelete(fpath)) {
std::cerr<<"Could not remove contents of \""<<fpath<<"\""<<std::endl;
return false;
}
}
if(!RemoveDirectory(path.c_str())) {
std::cerr<<"Could not remove \""<<path<<"\""<<std::endl;
return false;
}
} else {
if(!DeleteFile(path.c_str())) {
std::cerr<<"Could not remove \""<<path<<"\""<<std::endl;
return false;
}
}
}
return true;
}

5
src/porting.cpp
View File

@ -205,12 +205,13 @@ void initializePaths(char* argv0)
len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
assert(len < buflen);
pathRemoveFile(buf, '\\');
pathRemoveFile(buf, '\\');
// Use "./bin/../data"
path_data = std::string(buf) + DIR_DELIM ".." DIR_DELIM "data";
path_data = std::string(buf) + DIR_DELIM + "data";
// Use "./bin/.."
path_userdata = std::string(buf) + DIR_DELIM "..";
path_userdata = std::string(buf);
/*
Linux