revert deckmanager

Classes/gframe/deck_con.h

@@ -66,12 +66,10 @@ public:
 	size_t pre_extrac;
 	size_t pre_sidec;
 	code_pointer draging_pointer;
-	int prev_category;
 	int prev_deck;
 	s32 prev_operation;
 	int prev_sel;
 	bool is_modified;
-	bool readonly;
 
 	std::unordered_map<int, int>* filterList;
 	std::vector<code_pointer> results;

Classes/gframe/deck_manager.cpp

@@ -8,7 +8,7 @@ namespace ygo {
 
 DeckManager deckManager;
 
-void DeckManager::LoadLFListSingle(const char* path) {
+void DeckManager::LoadLFList(const char* path, bool load_none) {
 	LFList* cur = NULL;
 	FILE* fp = fopen(path, "r");
 	char linebuf[256];
@@ -24,7 +24,7 @@ void DeckManager::LoadLFListSingle(const char* path) {
 				LFList newlist;
 				_lfList.push_back(newlist);
 				cur = &_lfList[_lfList.size() - 1];
-				memcpy(cur->listName, (const void*)strBuffer, 20 * sizeof(wchar_t));
+				memcpy(cur->listName, (const void*)strBuffer, 40);
 				cur->listName[sa] = 0;
 				cur->content = new std::unordered_map<int, int>;
 				cur->hash = 0x7dfcee6a;
@@ -48,16 +48,31 @@ void DeckManager::LoadLFListSingle(const char* path) {
 		}
 		fclose(fp);
 	}
-}
-void DeckManager::LoadLFList() {
-	LoadLFListSingle("expansions/lflist.conf");
-	LoadLFListSingle("lflist.conf");
+	if(!load_none)
+		return;
 	LFList nolimit;
 	myswprintf(nolimit.listName, L"N/A");
 	nolimit.hash = 0;
 	nolimit.content = new std::unordered_map<int, int>;
 	_lfList.push_back(nolimit);
 }
+bool DeckManager::RenameDeck(const wchar_t* oldname, const wchar_t* newname) {
+	wchar_t oldfname[256];
+	wchar_t newfname[256];
+	myswprintf(oldfname, L"./deck/%ls.ydk", oldname);
+	myswprintf(newfname, L"./deck/%ls.ydk", newname);
+#ifdef WIN32
+	BOOL result = MoveFileW(oldfname, newfname);
+	return !!result;
+#else
+	char oldfilefn[256];
+	char newfilefn[256];
+	BufferIO::EncodeUTF8(oldfname, oldfilefn);
+	BufferIO::EncodeUTF8(newfname, newfilefn);
+	int result = rename(oldfilefn, newfilefn);
+	return result == 0;
+#endif
+}
 wchar_t* DeckManager::GetLFListName(int lfhash) {
 	for(size_t i = 0; i < _lfList.size(); ++i) {
 		if(_lfList[i].hash == (unsigned int)lfhash) {
@@ -191,37 +206,6 @@ bool DeckManager::LoadSide(Deck& deck, int* dbuf, int mainc, int sidec) {
 	deck = ndeck;
 	return true;
 }
-void DeckManager::GetCategoryPath(wchar_t* ret, int index, const wchar_t* text) {
-	wchar_t catepath[256];
-	switch(index) {
-	case 0:
-		myswprintf(catepath, L"./pack");
-		break;
-	case 1:
-		myswprintf(catepath, mainGame->gameConf.bot_deck_path);
-		break;
-	case -1:
-	case 2:
-	case 3:
-		myswprintf(catepath, L"./deck");
-		break;
-	default:
-		myswprintf(catepath, L"./deck/%ls", text);
-	}
-	BufferIO::CopyWStr(catepath, ret, 256);
-}
-void DeckManager::GetDeckFile(wchar_t* ret, irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck) {
-	wchar_t filepath[256];
-	wchar_t catepath[256];
-	GetCategoryPath(catepath, cbCategory->getSelected(), cbCategory->getText());
-	myswprintf(filepath, L"%ls/%ls.ydk", catepath, cbDeck->getItem(cbDeck->getSelected()));
-	BufferIO::CopyWStr(filepath, ret, 256);
-}
-bool DeckManager::LoadDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck) {
-	wchar_t filepath[256];
-	GetDeckFile(filepath, cbCategory, cbDeck);
-	return LoadDeck(filepath);
-}
 FILE* DeckManager::OpenDeckFile(const wchar_t* file, const char* mode) {
 #ifdef WIN32
 	FILE* fp = _wfopen(file, (wchar_t*)mode);
@@ -234,11 +218,11 @@ FILE* DeckManager::OpenDeckFile(const wchar_t* file, const char* mode) {
 }
 bool DeckManager::LoadDeck(const wchar_t* file) {
 	int sp = 0, ct = 0, mainc = 0, sidec = 0, code;
-	FILE* fp = OpenDeckFile(file, "r");
-	if(!fp) {
 	wchar_t localfile[64];
 	myswprintf(localfile, L"./deck/%ls.ydk", file);
-		fp = OpenDeckFile(localfile, "r");
+	FILE* fp = OpenDeckFile(localfile, "r");
+	if(!fp) {
+		fp = OpenDeckFile(file, "r");
 	}
 	if(!fp)
 		return false;
@@ -264,9 +248,9 @@ bool DeckManager::LoadDeck(const wchar_t* file) {
 	LoadDeck(current_deck, cardlist, mainc, sidec);
 	return true;
 }
-bool DeckManager::SaveDeck(Deck& deck, const wchar_t* file) {
-	if(!FileSystem::IsDirExists(L"./deck") && !FileSystem::MakeDir(L"./deck"))
-		return false;
+bool DeckManager::SaveDeck(Deck& deck, const wchar_t* name) {
+	wchar_t file[64];
+	myswprintf(file, L"./deck/%ls.ydk", name);
 	FILE* fp = OpenDeckFile(file, "w");
 	if(!fp)
 		return false;
@@ -282,7 +266,9 @@ bool DeckManager::SaveDeck(Deck& deck, const wchar_t* file) {
 	fclose(fp);
 	return true;
 }
-bool DeckManager::DeleteDeck(const wchar_t* file) {
+bool DeckManager::DeleteDeck(Deck& deck, const wchar_t* name) {
+	wchar_t file[64];
+	myswprintf(file, L"./deck/%ls.ydk", name);
 #ifdef WIN32
 	BOOL result = DeleteFileW(file);
 	return !!result;
@@ -293,31 +279,13 @@ bool DeckManager::DeleteDeck(const wchar_t* file) {
 	return result == 0;
 #endif
 }
-bool DeckManager::CreateCategory(const wchar_t* name) {
-	if(!FileSystem::IsDirExists(L"./deck") && !FileSystem::MakeDir(L"./deck"))
-		return false;
-	if(name[0] == 0)
-		return false;
-	wchar_t localname[256];
-	myswprintf(localname, L"./deck/%ls", name);
-	return FileSystem::MakeDir(localname);
-}
-bool DeckManager::RenameCategory(const wchar_t* oldname, const wchar_t* newname) {
-	if(!FileSystem::IsDirExists(L"./deck") && !FileSystem::MakeDir(L"./deck"))
-		return false;
-	if(newname[0] == 0)
-		return false;
-	wchar_t oldlocalname[256];
-	wchar_t newlocalname[256];
-	myswprintf(oldlocalname, L"./deck/%ls", oldname);
-	myswprintf(newlocalname, L"./deck/%ls", newname);
-	return FileSystem::Rename(oldlocalname, newlocalname);
-}
-bool DeckManager::DeleteCategory(const wchar_t* name) {
-	wchar_t localname[256];
-	myswprintf(localname, L"./deck/%ls", name);
-	if(!FileSystem::IsDirExists(localname))
-		return false;
-	return FileSystem::DeleteDir(localname);
+int DeckManager::TypeCount(std::vector<code_pointer> list, unsigned int ctype) {
+	int res = 0;
+	for(size_t i = 0; i < list.size(); ++i) {
+		code_pointer cur = list[i];
+		if(cur->second.type & ctype)
+			res++;
+	}
+	return res;
 }
 }

Classes/gframe/deck_manager.h

@@ -35,22 +35,17 @@ public:
 	Deck current_deck;
 	std::vector<LFList> _lfList;
 
-	void LoadLFListSingle(const char* path);
-	void LoadLFList();
+	void LoadLFList(const char* path, bool load_none);
 	wchar_t* GetLFListName(int lfhash);
 	int CheckDeck(Deck& deck, int lfhash, bool allow_ocg, bool allow_tcg);
 	int LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec);
 	bool LoadSide(Deck& deck, int* dbuf, int mainc, int sidec);
-	void GetCategoryPath(wchar_t* ret, int index, const wchar_t* text);
-	void GetDeckFile(wchar_t* ret, irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck);
-	bool LoadDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck);
 	FILE* OpenDeckFile(const wchar_t * file, const char * mode);
 	bool LoadDeck(const wchar_t* file);
-	bool SaveDeck(Deck& deck, const wchar_t* file);
-	bool DeleteDeck(const wchar_t* file);
-	bool CreateCategory(const wchar_t* name);
-	bool RenameCategory(const wchar_t* oldname, const wchar_t* newname);
-	bool DeleteCategory(const wchar_t* name);
+	bool SaveDeck(Deck& deck, const wchar_t* name);
+	bool DeleteDeck(Deck& deck, const wchar_t* name);
+	static bool RenameDeck(const wchar_t* oldname, const wchar_t* newname);
+	int TypeCount(std::vector<code_pointer> list, unsigned int ctype);
 };
 
 extern DeckManager deckManager;

Classes/gframe/duelclient.cpp

@@ -304,7 +304,6 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 			}
 			}
 			mainGame->env->addMessageBox(L"", msgbuf);
-			mainGame->cbCategorySelect->setEnabled(true);
 			mainGame->cbDeckSelect->setEnabled(true);
 			mainGame->gMutex.Unlock();
 			break;
@@ -468,8 +467,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->stHostPrepDuelist[3]->setText(L"");
 		mainGame->stHostPrepOB->setText(L"");
 		mainGame->SetStaticText(mainGame->stHostPrepRule, 180 * mainGame->xScale, mainGame->guiFont, str.c_str());
-		mainGame->RefreshCategoryDeck(mainGame->cbCategorySelect, mainGame->cbDeckSelect);
-		mainGame->cbCategorySelect->setEnabled(true);
+		mainGame->RefreshDeck(mainGame->cbDeckSelect);
 		mainGame->cbDeckSelect->setEnabled(true);
 		if(mainGame->wCreateHost->isVisible())
 			mainGame->HideElement(mainGame->wCreateHost);

Classes/gframe/game.h

@@ -23,12 +23,10 @@ struct Config {
 	wchar_t lastport[10];
 	wchar_t nickname[20];
 	wchar_t gamename[20];
-	wchar_t lastcategory[64];
 	wchar_t lastdeck[64];
 	wchar_t textfont[256];
 	wchar_t numfont[256];
 	wchar_t roompass[20];
-	wchar_t bot_deck_path[64];
 	//settings
 	int chkMAutoPos;
 	int chkSTAutoPos;
@@ -121,9 +119,7 @@ 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 LoadExpansions();
-	void RefreshCategoryDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck, bool selectlastused = true);
-	void RefreshDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck);
-	void RefreshDeck(const wchar_t* deckpath, irr::gui::IGUIComboBox* cbDeck);
+	void RefreshDeck(irr::gui::IGUIComboBox* cbDeck);
 	void RefreshReplay();
 	void RefreshSingleplay();
 	void RefreshBot();
@@ -255,12 +251,12 @@ public:
 	irr::gui::IGUICheckBox* chkRandomPos;
 	irr::gui::IGUICheckBox* chkAutoChain;
 	irr::gui::IGUICheckBox* chkWaitChain;
-	irr::gui::IGUICheckBox* chkQuickAnimation;
-	irr::gui::IGUICheckBox* chkAutoSaveReplay;
 	irr::gui::IGUIWindow* tabSystem;
 	irr::gui::IGUIElement* elmTabSystemLast;
 	irr::gui::IGUIScrollBar* scrTabSystem;
 	irr::gui::IGUICheckBox* chkDrawFieldSpell;
+	irr::gui::IGUICheckBox* chkQuickAnimation;
+	irr::gui::IGUICheckBox* chkAutoSaveReplay;
 	irr::gui::IGUICheckBox* chkIgnoreDeckChanges;
 	irr::gui::IGUICheckBox* chkAutoSearch;
 	irr::gui::IGUICheckBox* chkMultiKeywords;
@@ -307,7 +303,6 @@ public:
 	irr::gui::IGUIStaticText* stHostPrepDuelist[4];
 	irr::gui::IGUICheckBox* chkHostPrepReady[4];
 	irr::gui::IGUIButton* btnHostPrepKick[4];
-	irr::gui::IGUIComboBox* cbCategorySelect;
 	irr::gui::IGUIComboBox* cbDeckSelect;
 	irr::gui::IGUIStaticText* stHostPrepRule;
 	irr::gui::IGUIStaticText* stHostPrepOB;
@@ -427,9 +422,8 @@ public:
 	irr::gui::IGUIButton* btnEP;
 	//deck edit
 	irr::gui::IGUIStaticText* wDeckEdit;
-	irr::gui::IGUIComboBox* cbDBCategory;
+	irr::gui::IGUIComboBox* cbDBLFList;
 	irr::gui::IGUIComboBox* cbDBDecks;
-	irr::gui::IGUIButton* btnManageDeck;
 	irr::gui::IGUIButton* btnClearDeck;
 	irr::gui::IGUIButton* btnSortDeck;
 	irr::gui::IGUIButton* btnShuffleDeck;
@@ -441,37 +435,12 @@ public:
 	irr::gui::IGUIButton* btnSideSort;
 	irr::gui::IGUIButton* btnSideReload;
 	irr::gui::IGUIEditBox* ebDeckname;
-	irr::gui::IGUIStaticText* stDBCategory;
-	irr::gui::IGUIStaticText* stDeck;
-	irr::gui::IGUIStaticText* stCategory;
-	irr::gui::IGUIStaticText* stLimit;
-	irr::gui::IGUIStaticText* stAttribute;
-	irr::gui::IGUIStaticText* stRace;
-	irr::gui::IGUIStaticText* stAttack;
-	irr::gui::IGUIStaticText* stDefense;
-	irr::gui::IGUIStaticText* stStar;
-	irr::gui::IGUIStaticText* stSearch;
-	irr::gui::IGUIStaticText* stScale;
-	//deck manage
-	irr::gui::IGUIWindow* wDeckManage;
-	irr::gui::IGUIListBox* lstCategories;
-	irr::gui::IGUIListBox* lstDecks;
-	irr::gui::IGUIButton* btnNewCategory;
-	irr::gui::IGUIButton* btnRenameCategory;
-	irr::gui::IGUIButton* btnDeleteCategory;
-	irr::gui::IGUIButton* btnNewDeck;
 	irr::gui::IGUIButton* btnRenameDeck;
-	irr::gui::IGUIButton* btnDMDeleteDeck;
-	irr::gui::IGUIButton* btnMoveDeck;
-	irr::gui::IGUIButton* btnCopyDeck;
-	irr::gui::IGUIWindow* wDMQuery;
-	irr::gui::IGUIStaticText* stDMMessage;
-	irr::gui::IGUIStaticText* stDMMessage2;
-	irr::gui::IGUIEditBox* ebDMName;
-	irr::gui::IGUIComboBox* cbDMCategory;
-	irr::gui::IGUIButton* btnDMOK;
-	irr::gui::IGUIButton* btnDMCancel;
-	irr::gui::IGUIComboBox* cbLFList;
+	//deck rename
+	irr::gui::IGUIWindow* wRenameDeck;
+	irr::gui::IGUIEditBox* ebREName;
+	irr::gui::IGUIButton* btnREYes;
+	irr::gui::IGUIButton* btnRENo;
 	//filter
 	irr::gui::IGUIStaticText* wFilter;
 	irr::gui::IGUIScrollBar* scrFilter;
@@ -583,28 +552,12 @@ extern Game* mainGame;
 #define CHECKBOX_HP_READY			125
 #define BUTTON_HP_READY				126
 #define BUTTON_HP_NOTREADY			127
-#define COMBOBOX_HP_CATEGORY		128
 #define LISTBOX_REPLAY_LIST			130
 #define BUTTON_LOAD_REPLAY			131
 #define BUTTON_CANCEL_REPLAY		132
 #define BUTTON_DELETE_REPLAY		133
 #define BUTTON_RENAME_REPLAY		134
-#define BUTTON_REPLAY_START			140
-#define BUTTON_REPLAY_PAUSE			141
-#define BUTTON_REPLAY_STEP			142
-#define BUTTON_REPLAY_UNDO			143
-#define BUTTON_REPLAY_EXIT			144
-#define BUTTON_REPLAY_SWAP			145
-#define BUTTON_REPLAY_SAVE			146
-#define BUTTON_REPLAY_CANCEL		147
-#define LISTBOX_SINGLEPLAY_LIST		150
-#define BUTTON_LOAD_SINGLEPLAY		151
-#define BUTTON_CANCEL_SINGLEPLAY	152
-#define LISTBOX_BOT_LIST			153
-#define BUTTON_BOT_START			154
-#define CHECKBOX_BOT_OLD_RULE		155
-#define EDITBOX_CHAT				199
-
+#define EDITBOX_CHAT				140
 #define BUTTON_MSG_OK				200
 #define BUTTON_YES					201
 #define BUTTON_NO					202
@@ -669,8 +622,8 @@ extern Game* mainGame;
 #define BUTTON_DISPLAY_4			294
 #define SCROLL_CARD_DISPLAY			295
 #define BUTTON_CARD_DISP_OK			296
-#define BUTTON_MANAGE_DECK			300
-#define COMBOBOX_DBCATEGORY			301
+#define BUTTON_CATEGORY_OK			300
+#define COMBOBOX_DBLFLIST			301
 #define COMBOBOX_DBDECKS			302
 #define BUTTON_CLEAR_DECK			303
 #define BUTTON_SAVE_DECK			304
@@ -689,37 +642,37 @@ extern Game* mainGame;
 #define BUTTON_CLEAR_FILTER			317
 #define COMBOBOX_ATTRIBUTE			318
 #define COMBOBOX_RACE				319
-#define COMBOBOX_LIMIT				320
-#define BUTTON_CATEGORY_OK			321
-#define BUTTON_MARKS_FILTER			322
-#define BUTTON_MARKERS_OK			323
-#define COMBOBOX_SORTTYPE			324
-
-#define WINDOW_DECK_MANAGE			330
-#define BUTTON_NEW_CATEGORY			331
-#define BUTTON_RENAME_CATEGORY		332
-#define BUTTON_DELETE_CATEGORY		333
-#define BUTTON_NEW_DECK				334
-#define BUTTON_RENAME_DECK			335
-#define BUTTON_DELETE_DECK_DM		336
-#define BUTTON_MOVE_DECK			337
-#define BUTTON_COPY_DECK			338
-#define LISTBOX_CATEGORIES			339
-#define LISTBOX_DECKS				340
-#define BUTTON_DM_OK				341
-#define BUTTON_DM_CANCEL			342
-#define COMBOBOX_LFLIST				349
-
+#define BUTTON_REPLAY_START			320
+#define BUTTON_REPLAY_PAUSE			321
+#define BUTTON_REPLAY_STEP			322
+#define BUTTON_REPLAY_UNDO			323
+#define BUTTON_REPLAY_EXIT			324
+#define BUTTON_REPLAY_SWAP			325
+#define BUTTON_REPLAY_SAVE			330
+#define BUTTON_REPLAY_CANCEL		331
+#define BUTTON_BOT_START			340
+#define LISTBOX_BOT_LIST			341
+#define CHECKBOX_BOT_OLD_RULE		342
+#define LISTBOX_SINGLEPLAY_LIST		343
+#define BUTTON_LOAD_SINGLEPLAY		344
+#define BUTTON_CANCEL_SINGLEPLAY	345
+#define SCROLL_TAB_HELPER			350
+#define SCROLL_TAB_SYSTEM			351
 #define CHECKBOX_AUTO_SEARCH		360
 #define CHECKBOX_MULTI_KEYWORDS		372
 #define CHECKBOX_PREFER_EXPANSION	373
 #define CHECKBOX_DISABLE_CHAT		364
 #define CHECKBOX_DRAW_FIELD_SPELL	368
 #define CHECKBOX_QUICK_ANIMATION	369
-#define SCROLL_TAB_HELPER			370
-#define SCROLL_TAB_SYSTEM			371
-#define CHECKBOX_MULTI_KEYWORDS		372
-#define CHECKBOX_PREFER_EXPANSION	373
+#define COMBOBOX_SORTTYPE			370
+#define COMBOBOX_LIMIT				371
+
+#define BUTTON_MARKS_FILTER			380
+#define BUTTON_MARKERS_OK			381
+
+#define BUTTON_RENAME_DECK			386
+#define BUTTON_RENAME_DECK_SAVE			387
+#define BUTTON_RENAME_DECK_CANCEL		388
 
 #define DEFAULT_DUEL_RULE			4
 

Classes/gframe/myfilesystem.h

@@ -50,31 +50,6 @@ public:
 		return MakeDir(wdir);
 	}
 
-	static bool Rename(const wchar_t* woldname, const wchar_t* wnewname) {
-		return MoveFileW(woldname, wnewname);
-	}
-
-	static bool Rename(const char* oldname, const char* newname) {
-		wchar_t woldname[1024];
-		wchar_t wnewname[1024];
-		BufferIO::DecodeUTF8(oldname, woldname);
-		BufferIO::DecodeUTF8(newname, wnewname);
-		return Rename(woldname, wnewname);
-	}
-
-	static bool DeleteDir(const wchar_t* wdir) {
-		wchar_t pdir[256];
-		BufferIO::CopyWStr(wdir, pdir, 256);
-		pdir[wcslen(wdir) + 1] = 0;
-		SHFILEOPSTRUCTW lpFileOp;
-		lpFileOp.hwnd = NULL;
-		lpFileOp.wFunc = FO_DELETE;
-		lpFileOp.pFrom = pdir;
-		lpFileOp.pTo = 0;
-		lpFileOp.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_SILENT;
-		return SHFileOperationW(&lpFileOp) == 0;
-	}
-
 	static void TraversalDir(const wchar_t* wpath, const std::function<void(const wchar_t*, bool)>& cb) {
 		wchar_t findstr[1024];
 		wcscpy(findstr, wpath);
@@ -84,7 +59,6 @@ public:
 		if(fh == INVALID_HANDLE_VALUE)
 			return;
 		do {
-			if(mywcsncasecmp(fdataw.cFileName, L".", 1) && mywcsncasecmp(fdataw.cFileName, L"..", 2))
 			cb(fdataw.cFileName, (fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY));
 		} while(FindNextFileW(fh, &fdataw));
 		FindClose(fh);

Classes/gframe/premake4.lua

 include "lzma/."
-include "spmemvfs/."
 
 project "ygopro"
     kind "WindowedApp"
 
     files { "**.cpp", "**.cc", "**.c", "**.h" }
-    excludes { "lzma/**", "spmemvfs/**" }
+    excludes "lzma/**"
     includedirs { "../ocgcore" }
-    links { "ocgcore", "clzma", "cspmemvfs", "Irrlicht", "freetype", "sqlite3", "lua" , "event" }
+    links { "ocgcore", "clzma", "Irrlicht", "freetype", "sqlite3", "lua" , "event" }
 
     configuration "windows"
         files "ygopro.rc"