Commit 1fd5c87b authored by nanahira's avatar nanahira

merge

parents ff9faa03 24bc8c0c
......@@ -993,11 +993,11 @@ void Game::LoadExpansionDB() {
struct dirent * dirp;
if((dir = opendir("./expansions/")) != NULL) {
while((dirp = readdir(dir)) != NULL) {
if (f->d_type != DT_DIR)
if (dirp->d_type != DT_DIR)
continue;
char filepath[1000];
sprintf(filepath, "./expansions/%s/", dirp->d_name);
LoadExpansionDBDirectry(filepath)
LoadExpansionDBDirectry(filepath);
}
closedir(dir);
}
......@@ -1061,11 +1061,11 @@ void Game::LoadExpansionStrings() {
struct dirent * dirp;
if((dir = opendir("./expansions/")) != NULL) {
while((dirp = readdir(dir)) != NULL) {
if (f->d_type != DT_DIR)
if (dirp->d_type != DT_DIR)
continue;
char filepath[1000];
sprintf(filepath, "./expansions/%s/", dirp->d_name);
LoadExpansionStringsDirectry(filepath)
LoadExpansionStringsDirectry(filepath);
}
closedir(dir);
}
......
......@@ -972,7 +972,7 @@ byte* ReplayMode::ScriptReaderEx(const char* script_name, int* slen) {
struct dirent * dirp;
if((dir = opendir("./expansions/")) != NULL) {
while((dirp = readdir(dir)) != NULL) {
if (f->d_type != DT_DIR)
if (dirp->d_type != DT_DIR)
continue;
char filepath[1000];
sprintf(filepath, "./expansions/%s/", dirp->d_name);
......
......@@ -1585,7 +1585,7 @@ byte* SingleDuel::ScriptReaderEx(const char* script_name, int* slen) {
struct dirent * dirp;
if((dir = opendir("./expansions/")) != NULL) {
while((dirp = readdir(dir)) != NULL) {
if (f->d_type != DT_DIR)
if (dirp->d_type != DT_DIR)
continue;
char filepath[1000];
sprintf(filepath, "./expansions/%s/", dirp->d_name);
......
......@@ -893,7 +893,7 @@ byte* SingleMode::ScriptReaderEx(const char* script_name, int* slen) {
struct dirent * dirp;
if((dir = opendir("./expansions/")) != NULL) {
while((dirp = readdir(dir)) != NULL) {
if (f->d_type != DT_DIR)
if (dirp->d_type != DT_DIR)
continue;
char filepath[1000];
sprintf(filepath, "./expansions/%s/", dirp->d_name);
......
......@@ -1726,7 +1726,7 @@ byte* TagDuel::ScriptReaderEx(const char* script_name, int* slen) {
struct dirent * dirp;
if((dir = opendir("./expansions/")) != NULL) {
while((dirp = readdir(dir)) != NULL) {
if (f->d_type != DT_DIR)
if (dirp->d_type != DT_DIR)
continue;
char filepath[1000];
sprintf(filepath, "./expansions/%s/", dirp->d_name);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment