Commit 7e1d40b0 authored by nanahira's avatar nanahira

no going in pics and script in seaching expansions

parent 6a3499a5
...@@ -61,7 +61,7 @@ void DeckManager::LoadLFListSingle(const char* path) { ...@@ -61,7 +61,7 @@ void DeckManager::LoadLFListSingle(const char* path) {
void DeckManager::LoadLFList() { void DeckManager::LoadLFList() {
LoadLFListSingle("expansions/lflist.conf"); LoadLFListSingle("expansions/lflist.conf");
FileSystem::TraversalDir("./expansions", [this](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [this](const char* name, bool isdir) {
if(isdir && strcmp(name, ".") && strcmp(name, "..")) { if(isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char fpath[1024]; char fpath[1024];
sprintf(fpath, "./expansions/%s/lflist.conf", name); sprintf(fpath, "./expansions/%s/lflist.conf", name);
LoadLFListSingle(fpath); LoadLFListSingle(fpath);
......
...@@ -865,7 +865,7 @@ void Game::SetStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, irr::gu ...@@ -865,7 +865,7 @@ void Game::SetStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, irr::gu
void Game::LoadExpansionDB() { void Game::LoadExpansionDB() {
LoadExpansionDBDirectry("./expansions"); LoadExpansionDBDirectry("./expansions");
FileSystem::TraversalDir("./expansions", [this](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [this](const char* name, bool isdir) {
if(isdir && strcmp(name, ".") && strcmp(name, "..")) { if(isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char subdir[1024]; char subdir[1024];
sprintf(subdir, "./expansions/%s", name); sprintf(subdir, "./expansions/%s", name);
LoadExpansionDBDirectry(subdir); LoadExpansionDBDirectry(subdir);
...@@ -884,7 +884,7 @@ void Game::LoadExpansionDBDirectry(const char* path) { ...@@ -884,7 +884,7 @@ void Game::LoadExpansionDBDirectry(const char* path) {
void Game::LoadExpansionStrings() { void Game::LoadExpansionStrings() {
dataManager.LoadStrings("./expansions/strings.conf"); dataManager.LoadStrings("./expansions/strings.conf");
FileSystem::TraversalDir("./expansions", [](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [](const char* name, bool isdir) {
if(isdir && strcmp(name, ".") && strcmp(name, "..")) { if(isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char fpath[1024]; char fpath[1024];
sprintf(fpath, "./expansions/%s/strings.conf", name); sprintf(fpath, "./expansions/%s/strings.conf", name);
dataManager.LoadStrings(fpath); dataManager.LoadStrings(fpath);
......
...@@ -174,7 +174,7 @@ irr::video::ITexture* ImageManager::GetTextureExpansions(char* file, s32 width, ...@@ -174,7 +174,7 @@ irr::video::ITexture* ImageManager::GetTextureExpansions(char* file, s32 width,
return img; return img;
bool find = false; bool find = false;
FileSystem::TraversalDir("./expansions", [this, file, width, height, &img, &find](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [this, file, width, height, &img, &find](const char* name, bool isdir) {
if(!find && isdir && strcmp(name, ".") && strcmp(name, "..")) { if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char subdir[1024]; char subdir[1024];
sprintf(subdir, "./expansions/%s", name); sprintf(subdir, "./expansions/%s", name);
img = GetTextureExpansionsDirectry(subdir, file, width, height); img = GetTextureExpansionsDirectry(subdir, file, width, height);
......
...@@ -944,7 +944,7 @@ byte* ReplayMode::ScriptReaderEx(const char* script_name, int* slen) { ...@@ -944,7 +944,7 @@ byte* ReplayMode::ScriptReaderEx(const char* script_name, int* slen) {
return buffer; return buffer;
bool find = false; bool find = false;
FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) {
if(!find && isdir && strcmp(name, ".") && strcmp(name, "..")) { if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char subdir[1024]; char subdir[1024];
sprintf(subdir, "./expansions/%s", name); sprintf(subdir, "./expansions/%s", name);
buffer = ScriptReaderExDirectry(subdir, script_name, slen); buffer = ScriptReaderExDirectry(subdir, script_name, slen);
......
...@@ -1554,7 +1554,7 @@ byte* SingleDuel::ScriptReaderEx(const char* script_name, int* slen) { ...@@ -1554,7 +1554,7 @@ byte* SingleDuel::ScriptReaderEx(const char* script_name, int* slen) {
return buffer; return buffer;
bool find = false; bool find = false;
FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) {
if(!find && isdir && strcmp(name, ".") && strcmp(name, "..")) { if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char subdir[1024]; char subdir[1024];
sprintf(subdir, "./expansions/%s", name); sprintf(subdir, "./expansions/%s", name);
buffer = ScriptReaderExDirectry(subdir, script_name, slen); buffer = ScriptReaderExDirectry(subdir, script_name, slen);
......
...@@ -861,7 +861,7 @@ byte* SingleMode::ScriptReaderEx(const char* script_name, int* slen) { ...@@ -861,7 +861,7 @@ byte* SingleMode::ScriptReaderEx(const char* script_name, int* slen) {
return buffer; return buffer;
bool find = false; bool find = false;
FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) {
if(!find && isdir && strcmp(name, ".") && strcmp(name, "..")) { if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char subdir[1024]; char subdir[1024];
sprintf(subdir, "./expansions/%s", name); sprintf(subdir, "./expansions/%s", name);
buffer = ScriptReaderExDirectry(subdir, script_name, slen); buffer = ScriptReaderExDirectry(subdir, script_name, slen);
......
...@@ -1672,7 +1672,7 @@ byte* TagDuel::ScriptReaderEx(const char* script_name, int* slen) { ...@@ -1672,7 +1672,7 @@ byte* TagDuel::ScriptReaderEx(const char* script_name, int* slen) {
return buffer; return buffer;
bool find = false; bool find = false;
FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) {
if(!find && isdir && strcmp(name, ".") && strcmp(name, "..")) { if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char subdir[1024]; char subdir[1024];
sprintf(subdir, "./expansions/%s", name); sprintf(subdir, "./expansions/%s", name);
buffer = ScriptReaderExDirectry(subdir, script_name, slen); buffer = ScriptReaderExDirectry(subdir, script_name, slen);
......
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