phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Removed my earlier 'fix' (related to a bug when adding new files to a directory that was previously archived) which was completely rubbish, and replaced it with one that is hopefully less stupid (and actually fixes the problem)

Browse Source 
This was SVN commit r1605.
This commit is contained in:
Ykkrosh 2005-01-01 13:43:43 +00:00
parent f9c51d8ec7
commit fcd1adcea3
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/lib/res/vfs.cpp
View File

@ -437,15 +437,11 @@ struct TDir
int TDir::add_subdir(const char* dir_name)
{
// ######################## TODO: Fix this ###########################
/*
if(find_subdir(dir_name))
if(find_file(dir_name))
{
debug_warn("TDir::add_subdir: file of same name already exists");
return -1;
}
*/
// The above code fails frequently and makes the game unplayable
TDirPair pair = std::make_pair(dir_name, TDir());
std::pair<TDirIt, bool> ret = subdirs.insert(pair);
@ -856,7 +852,9 @@ static int dirent_cb(const char* name, const struct stat* s, uintptr_t user)
// directory: add it.
if(S_ISDIR(s->st_mode))
return dir->add_subdir(name);
// add_subdir returns -1 on error, 1 on it's-already-added,
// 0 on it's-now-added. Only consider -1 to be an error.
return (dir->add_subdir(name) < 0 ? 1 : 0);
// caller is requesting we look for archives
// (only happens in tree_add_dir's dir, not subdirectories. see below)