Revert "Merge branch 'subdir'"

This reverts commit a2455736, reversing
changes made to 83f05fd7.

gframe/data_manager.cpp

@@ -67,13 +67,7 @@ bool DataManager::LoadDB(const char* file) {
 	return true;
 }
 bool DataManager::LoadStrings(const char* file) {
-#ifdef _WIN32
-	wchar_t fname[1024];
-	BufferIO::DecodeUTF8(file, fname);
-	FILE* fp = _wfopen(fname, L"r");
-#else
 	FILE* fp = fopen(file, "r");
-#endif // _WIN32
 	if(!fp)
 		return false;
 	char linebuf[256];
@@ -320,34 +314,22 @@ int DataManager::CardReader(int code, void* pData) {
 byte* DataManager::ScriptReaderEx(const char* script_name, int* slen) {
 	byte* buffer;
 	if(!mainGame->gameConf.prefer_expansion_script) {
-		buffer = ScriptReaderExDirectry(".", script_name, slen);
+		buffer = ScriptReaderExSingle(".", script_name, slen);
 		if(buffer)
 			return buffer;
 	}
-	buffer = ScriptReaderExDirectry("./specials", script_name, slen, 8);
+	buffer = ScriptReaderExSingle("./specials", script_name, slen, 8);
 	if(buffer)
 		return buffer;
-	buffer = ScriptReaderExDirectry("./expansions", script_name, slen);
+	buffer = ScriptReaderExSingle("./expansions", script_name, slen);
 	if(buffer)
 		return buffer;
-	buffer = ScriptReaderExDirectry("./beta", script_name, slen);
+	buffer = ScriptReaderExSingle("./beta", script_name, slen);
 	if(buffer)
 		return buffer;
-	bool find = false;
-	FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) {
-		if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
-			char subdir[1024];
-			sprintf(subdir, "./expansions/%s", name);
-			buffer = ScriptReaderExDirectry(subdir, script_name, slen);
-			if(buffer)
-				find = true;
-		}
-	});
-	if(find)
-		return buffer;
 	return ScriptReader(script_name, slen);
 }
-byte* DataManager::ScriptReaderExDirectry(const char* path, const char* script_name, int* slen, int pre_len) {
+byte* DataManager::ScriptReaderExSingle(const char* path, const char* script_name, int* slen, int pre_len) {
 	char sname[256];
 	sprintf(sname, "%s%s", path, script_name + pre_len); //default script name: ./script/c%d.lua
 	return ScriptReader(sname, slen);

gframe/data_manager.h

@@ -53,7 +53,7 @@ public:
 	static const wchar_t* unknown_string;
 	static int CardReader(int, void*);
 	static byte* ScriptReaderEx(const char* script_name, int* slen);
-	static byte* ScriptReaderExDirectry(const char* path, const char* script_name, int* slen, int pre_len = 1);
+	static byte* ScriptReaderExSingle(const char* path, const char* script_name, int* slen, int pre_len = 1);
 	static byte* ScriptReader(const char* script_name, int* slen);
 
 };

gframe/deck_manager.cpp

@@ -10,13 +10,7 @@ DeckManager deckManager;
 
 void DeckManager::LoadLFListSingle(const char* path) {
 	LFList* cur = NULL;
-#ifdef _WIN32
-	wchar_t fname[1024];
-	BufferIO::DecodeUTF8(path, fname);
-	FILE* fp = _wfopen(fname, L"r");
-#else
 	FILE* fp = fopen(path, "r");
-#endif // _WIN32
 	char linebuf[256];
 	wchar_t strBuffer[256];
 	if(fp) {
@@ -57,13 +51,6 @@ void DeckManager::LoadLFListSingle(const char* path) {
 }
 void DeckManager::LoadLFList() {
 	LoadLFListSingle("expansions/lflist.conf");
-	FileSystem::TraversalDir("./expansions", [this](const char* name, bool isdir) {
-		if(isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
-			char fpath[1024];
-			sprintf(fpath, "./expansions/%s/lflist.conf", name);
-			LoadLFListSingle(fpath);
-		}
-	});
 	LoadLFListSingle("lflist.conf");
 	LFList nolimit;
 	myswprintf(nolimit.listName, L"N/A");

gframe/game.cpp

@@ -89,7 +89,7 @@ bool Game::Initialize() {
 		ErrorLog("Failed to load strings!");
 		return false;
 	}
-	LoadExpansionStrings();
+	dataManager.LoadStrings("./expansions/strings.conf");
 	env = device->getGUIEnvironment();
 	numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 16);
 	adFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 12);
@@ -982,34 +982,14 @@ void Game::SetStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, irr::gu
 	pControl->setText(dataManager.strBuffer);
 }
 void Game::LoadExpansionDB() {
-	LoadExpansionDBDirectry("./expansions");
-	FileSystem::TraversalDir("./expansions", [this](const char* name, bool isdir) {
-		if(isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
-			char subdir[1024];
-			sprintf(subdir, "./expansions/%s", name);
-			LoadExpansionDBDirectry(subdir);
-		}
-	});
-}
-void Game::LoadExpansionDBDirectry(const char* path) {
-	FileSystem::TraversalDir(path, [path](const char* name, bool isdir) {
+	FileSystem::TraversalDir("./expansions", [](const char* name, bool isdir) {
 		if(!isdir && strrchr(name, '.') && !mystrncasecmp(strrchr(name, '.'), ".cdb", 4)) {
 			char fpath[1024];
-			sprintf(fpath, "%s/%s", path, name);
+			sprintf(fpath, "./expansions/%s", name);
 			dataManager.LoadDB(fpath);
 		}
 	});
 }
-void Game::LoadExpansionStrings() {
-	dataManager.LoadStrings("./expansions/strings.conf");
-	FileSystem::TraversalDir("./expansions", [](const char* name, bool isdir) {
-		if(isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
-			char fpath[1024];
-			sprintf(fpath, "./expansions/%s/strings.conf", name);
-			dataManager.LoadStrings(fpath);
-		}
-	});
-}
 void Game::RefreshDeck(irr::gui::IGUIComboBox* cbDeck) {
 	cbDeck->clear();
 	FileSystem::TraversalDir(L"./deck", [cbDeck](const wchar_t* name, bool isdir) {

gframe/game.h

@@ -130,8 +130,6 @@ public:
 	void InitStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, u32 cHeight, irr::gui::CGUITTFont* font, const wchar_t* text);
 	void SetStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, irr::gui::CGUITTFont* font, const wchar_t* text, u32 pos = 0);
 	void LoadExpansionDB();
-	void LoadExpansionDBDirectry(const char* path);
-	void LoadExpansionStrings();
 	void RefreshDeck(irr::gui::IGUIComboBox* cbDeck);
 	void RefreshReplay();
 	void RefreshSingleplay();

gframe/image_manager.cpp

@@ -274,54 +274,24 @@ void imageScaleNNAA(irr::video::IImage *src, irr::video::IImage *dest) {
 		}
 }
 irr::video::ITexture* ImageManager::GetTextureFromFile(char* file, s32 width, s32 height) {
-#ifdef _WIN32
-	wchar_t name[1024];
-	BufferIO::DecodeUTF8(file, name);
-#else
-	char* name = file;
-#endif // _WIN32
-
 	if(mainGame->gameConf.use_image_scale) {
 		irr::video::ITexture* texture;
-		irr::video::IImage* srcimg = driver->createImageFromFile(name);
+		irr::video::IImage* srcimg = driver->createImageFromFile(file);
 		if(srcimg == NULL)
 			return NULL;
 		if(srcimg->getDimension() == irr::core::dimension2d<u32>(width, height)) {
-			texture = driver->addTexture(name, srcimg);
+			texture = driver->addTexture(file, srcimg);
 		} else {
 			video::IImage *destimg = driver->createImage(srcimg->getColorFormat(), irr::core::dimension2d<u32>(width, height));
 			imageScaleNNAA(srcimg, destimg);
-			texture = driver->addTexture(name, destimg);
+			texture = driver->addTexture(file, destimg);
 			destimg->drop();
 		}
 		srcimg->drop();
 		return texture;
 	} else {
-		return driver->getTexture(name);
-	}
-}
-irr::video::ITexture* ImageManager::GetTextureExpansions(char* file, s32 width, s32 height) {
-	irr::video::ITexture* img = GetTextureExpansionsDirectry("./expansions", file, width, height);
-	if(img != NULL)
-		return img;
-	bool find = false;
-	FileSystem::TraversalDir("./expansions", [this, file, width, height, &img, &find](const char* name, bool isdir) {
-		if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
-			char subdir[1024];
-			sprintf(subdir, "./expansions/%s", name);
-			img = GetTextureExpansionsDirectry(subdir, file, width, height);
-			if(img)
-				find = true;
+		return driver->getTexture(file);
 	}
-	});
-	if(find)
-		return img;
-	return img;
-}
-irr::video::ITexture* ImageManager::GetTextureExpansionsDirectry(const char* path, char* file, s32 width, s32 height) {
-	char fpath[1000];
-	sprintf(fpath, "%s/%s", path, file);
-	return GetTextureFromFile(fpath, width, height);
 }
 irr::video::ITexture* ImageManager::GetTexture(int code, bool fit) {
 	if(code == 0)
@@ -338,11 +308,11 @@ irr::video::ITexture* ImageManager::GetTexture(int code, bool fit) {
 	auto tit = tMap[fit ? 1 : 0].find(code);
 	if(tit == tMap[fit ? 1 : 0].end()) {
 		char file[256];
-		sprintf(file, "pics/%d.png", code);
-		irr::video::ITexture* img = GetTextureExpansions(file, width, height);
+		sprintf(file, "expansions/pics/%d.png", code);
+		irr::video::ITexture* img = GetTextureFromFile(file, width, height);
 		if(img == NULL) {
-			sprintf(file, "pics/%d.jpg", code);
-			img = GetTextureExpansions(file, width, height);
+			sprintf(file, "expansions/pics/%d.jpg", code);
+			img = GetTextureFromFile(file, width, height);
 		}
 		if(img == NULL) {
 			sprintf(file, mainGame->GetLocaleDir("pics/%d.png"), code);
@@ -380,11 +350,11 @@ irr::video::ITexture* ImageManager::GetTextureThumb(int code) {
 	int height = CARD_THUMB_HEIGHT * mainGame->yScale;
 	if(tit == tThumb.end()) {
 		char file[256];
-		sprintf(file, "pics/thumbnail/%d.png", code);
-		irr::video::ITexture* img = GetTextureExpansions(file, width, height);
+		sprintf(file, "expansions/pics/thumbnail/%d.png", code);
+		irr::video::ITexture* img = GetTextureFromFile(file, width, height);
 		if(img == NULL) {
-			sprintf(file, "pics/thumbnail/%d.jpg", code);
-			img = GetTextureExpansions(file, width, height);
+			sprintf(file, "expansions/pics/thumbnail/%d.jpg", code);
+			img = GetTextureFromFile(file, width, height);
 		}
 		if(img == NULL) {
 			sprintf(file, mainGame->GetLocaleDir("pics/thumbnail/%d.png"), code);
@@ -403,11 +373,11 @@ irr::video::ITexture* ImageManager::GetTextureThumb(int code) {
 			img = GetTextureFromFile(file, width, height);
 		}
 		if(img == NULL && mainGame->gameConf.use_image_scale) {
-			sprintf(file, "pics/%d.png", code);
-			img = GetTextureExpansions(file, width, height);
+			sprintf(file, "expansions/pics/%d.png", code);
+			img = GetTextureFromFile(file, width, height);
 			if(img == NULL) {
-				sprintf(file, "pics/%d.jpg", code);
-				img = GetTextureExpansions(file, width, height);
+				sprintf(file, "expansions/pics/%d.jpg", code);
+				img = GetTextureFromFile(file, width, height);
 			}
 			if(img == NULL) {
 				sprintf(file, mainGame->GetLocaleDir("pics/%d.png"), code);
@@ -437,11 +407,11 @@ irr::video::ITexture* ImageManager::GetTextureThumb(int code) {
 	auto tit = tFields.find(code);
 	if(tit == tFields.end()) {
 		char file[256];
-		sprintf(file, "pics/field/%d.png", code);
-		irr::video::ITexture* img = GetTextureExpansions(file, 512 * mainGame->xScale, 512 * mainGame->yScale);
+		sprintf(file, "expansions/pics/field/%d.png", code);
+		irr::video::ITexture* img = GetTextureFromFile(file, 512 * mainGame->xScale, 512 * mainGame->yScale);
 		if(img == NULL) {
-			sprintf(file, "pics/field/%d.jpg", code);
-			img = GetTextureExpansions(file, 512 * mainGame->xScale, 512 * mainGame->yScale);
+			sprintf(file, "expansions/pics/field/%d.jpg", code);
+			img = GetTextureFromFile(file, 512 * mainGame->xScale, 512 * mainGame->yScale);
 		}
 		if(img == NULL) {
 			sprintf(file, mainGame->GetLocaleDir("pics/field/%d.png"), code);
@@ -481,11 +451,11 @@ irr::video::ITexture* ImageManager::GetTextureField(int code) {
 	auto tit = tFields.find(code);
 	if(tit == tFields.end()) {
 		char file[256];
-		sprintf(file, "pics/field/%d.png", code);
-		irr::video::ITexture* img = GetTextureExpansions(file, 512 * mainGame->xScale, 512 * mainGame->yScale);
+		sprintf(file, "expansions/pics/field/%d.png", code);
+		irr::video::ITexture* img = GetTextureFromFile(file, 512 * mainGame->xScale, 512 * mainGame->yScale);
 		if(img == NULL) {
-			sprintf(file, "pics/field/%d.jpg", code);
-			img = GetTextureExpansions(file, 512 * mainGame->xScale, 512 * mainGame->yScale);
+			sprintf(file, "expansions/pics/field/%d.jpg", code);
+			img = GetTextureFromFile(file, 512 * mainGame->xScale, 512 * mainGame->yScale);
 		}
 		if(img == NULL) {
 			sprintf(file, mainGame->GetLocaleDir("pics/field/%d.png"), code);

gframe/image_manager.h

@@ -22,8 +22,6 @@ public:
 	void RemoveTexture(int code);
 	void ResizeTexture();
 	irr::video::ITexture* GetTextureFromFile(char* file, s32 width, s32 height);
-	irr::video::ITexture* GetTextureExpansions(char* file, s32 width, s32 height);
-	irr::video::ITexture* GetTextureExpansionsDirectry(const char* path, char* file, s32 width, s32 height);
 	irr::video::ITexture* GetTexture(int code, bool fit = false);
 	irr::video::ITexture* GetTextureThumb(int code);
 	irr::video::ITexture* GetTextureField(int code);