Skip to content

Y
ygopro
Commit 069a6daa authored by nanahira's avatar nanahira
Browse files
Options

catchup

parent 18adae0a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
gframe/deck_manager.cpp
View file @ 069a6daa
...@@ -50,14 +50,14 @@ void DeckManager::LoadLFListSingle(const char* path) { ...@@ -50,14 +50,14 @@ void DeckManager::LoadLFListSingle(const char* path) {
} }
} }
void DeckManager::LoadLFList() { void DeckManager::LoadLFList() {
//LoadLFListSingle("expansions/lflist.conf"); LoadLFListSingle("expansions/lflist.conf");
#ifdef _WIN32 #ifdef _WIN32
char fpath[1000]; char fpath[1000];
WIN32_FIND_DATAW fdataw; WIN32_FIND_DATAW fdataw;
HANDLE fh = FindFirstFileW(L"./expansions/*", &fdataw); HANDLE fh = FindFirstFileW(L"./expansions/*", &fdataw);
if(fh != INVALID_HANDLE_VALUE) { if(fh != INVALID_HANDLE_VALUE) {
do { do {
if((fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { if(wcscmp(L".",fdataw.cFileName) != 0 && wcscmp(L"..",fdataw.cFileName) != 0 && fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
char fname[780]; char fname[780];
BufferIO::EncodeUTF8(fdataw.cFileName, fname); BufferIO::EncodeUTF8(fdataw.cFileName, fname);
sprintf(fpath, "./expansions/%s/lflist.conf", fname); sprintf(fpath, "./expansions/%s/lflist.conf", fname);
...@@ -71,7 +71,7 @@ void DeckManager::LoadLFList() { ...@@ -71,7 +71,7 @@ void DeckManager::LoadLFList() {
struct dirent * dirp; struct dirent * dirp;
if((dir = opendir("./expansions/")) != NULL) { if((dir = opendir("./expansions/")) != NULL) {
while((dirp = readdir(dir)) != NULL) { while((dirp = readdir(dir)) != NULL) {
if (dirp->d_type != DT_DIR) if (strcmp(".", dirp->d_name) == 0 || strcmp("..", dirp->d_name) == 0 || dirp->d_type != DT_DIR)
continue; continue;
char filepath[1000]; char filepath[1000];
sprintf(filepath, "./expansions/%s/lflist.conf", dirp->d_name); sprintf(filepath, "./expansions/%s/lflist.conf", dirp->d_name);
......
gframe/image_manager.cpp
View file @ 069a6daa
...@@ -335,7 +335,7 @@ irr::video::ITexture* ImageManager::GetTextureExpansions(char* file, s32 width, ...@@ -335,7 +335,7 @@ irr::video::ITexture* ImageManager::GetTextureExpansions(char* file, s32 width,
HANDLE fh = FindFirstFileW(L"./expansions/*", &fdataw); HANDLE fh = FindFirstFileW(L"./expansions/*", &fdataw);
if(fh != INVALID_HANDLE_VALUE) { if(fh != INVALID_HANDLE_VALUE) {
do { do {
if((fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { if(wcscmp(L".",fdataw.cFileName) != 0 && wcscmp(L"..",fdataw.cFileName) != 0 && fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
char fname[780]; char fname[780];
BufferIO::EncodeUTF8(fdataw.cFileName, fname); BufferIO::EncodeUTF8(fdataw.cFileName, fname);
sprintf(fpath, "./expansions/%s", fname); sprintf(fpath, "./expansions/%s", fname);
...@@ -351,7 +351,7 @@ irr::video::ITexture* ImageManager::GetTextureExpansions(char* file, s32 width, ...@@ -351,7 +351,7 @@ irr::video::ITexture* ImageManager::GetTextureExpansions(char* file, s32 width,
struct dirent * dirp; struct dirent * dirp;
if((dir = opendir("./expansions/")) != NULL) { if((dir = opendir("./expansions/")) != NULL) {
while((dirp = readdir(dir)) != NULL) { while((dirp = readdir(dir)) != NULL) {
if (dirp->d_type != DT_DIR) if (strcmp(".", dirp->d_name) == 0 || strcmp("..", dirp->d_name) == 0 || dirp->d_type != DT_DIR)
continue; continue;
char filepath[1000]; char filepath[1000];
sprintf(filepath, "./expansions/%s/", dirp->d_name); 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