commit f876e3cb

sago007 · 2008-11-14 21:21
f876e3cb471e67179eb695f6d7dd8bcfc1a7d839 patch · browse files
parent 24a6ea5f198436b8c352234d37d1ce5ff61392b4

Removed an error in the way we read files


git-svn-id: https://blockattack.svn.sourceforge.net/svnroot/blockattack/trunk@52 9d7177f8-192b-0410-8f35-a16a89829b06

Changed files

M	source/code/listFiles.cpp before
M	source/code/listFiles.h before

diff --git a/source/code/listFiles.cpp b/source/code/listFiles.cpp index 1c840c4..a6b6758 100644 --- a/source/code/listFiles.cpp +++ b/source/code/listFiles.cpp

@@ -81,8 +81,12 @@ void ListFiles::setDirectory(string directory)

return;

while ((dp=readdir(DirectoryPointer))&&(nrOfFiles<MAX_NR_OF_FILES-1))

{

- nrOfFiles++;

- filenames[nrOfFiles] = (string)(char*)dp->d_name;

+ string name = (string)(char*)dp->d_name;

+ if (!isInList(name) && name != "." && name != "..")

+ {

+ nrOfFiles++;

+ filenames[nrOfFiles] = name;

+ }

}

closedir(DirectoryPointer);

@@ -116,7 +120,7 @@ void ListFiles::setDirectory2(string dic)

while ((dp=readdir(DirectoryPointer))&&(nrOfFiles<MAX_NR_OF_FILES-1))

{

string name = (string)(char*)dp->d_name;

- if (!isInList(name))

+ if (!isInList(name) && name != "." && name != "..")

{

nrOfFiles++;

filenames[nrOfFiles] = name;

diff --git a/source/code/listFiles.h b/source/code/listFiles.h index f60b8af..7e35648 100644 --- a/source/code/listFiles.h +++ b/source/code/listFiles.h

#if defined (_WIN32)

#define FIRST_FILE 2

#else

-#define FIRST_FILE 3

+#define FIRST_FILE 1

#endif

using namespace std;