Merge branch 'master' into server

gframe/deck_con.cpp

@@ -177,6 +177,46 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				}
 				break;
 			}
+			case BUTTON_RENAME_DECK: {
+				int sel = mainGame->cbDBDecks->getSelected();
+				if(sel == -1)
+					break;
+				mainGame->gMutex.Lock();
+				mainGame->wRenameDeck->setText(dataManager.GetSysString(1367));
+				mainGame->ebREName->setText(mainGame->cbDBDecks->getItem(sel));
+				mainGame->PopupElement(mainGame->wRenameDeck);
+				mainGame->gMutex.Unlock();
+				prev_operation = id;
+				prev_sel = sel;
+				break;
+			}
+			case BUTTON_RENAME_DECK_SAVE: {
+				mainGame->HideElement(mainGame->wRenameDeck);
+				if(prev_operation == BUTTON_RENAME_DECK) {
+					wchar_t newname[256];
+					BufferIO::CopyWStr(mainGame->ebREName->getText(), newname, 256);
+					if(mywcsncasecmp(newname + wcslen(newname) - 4, L"", 4)) {
+						myswprintf(newname, L"%ls", mainGame->ebREName->getText());
+					}
+					if(DeckManager::RenameDeck(mainGame->cbDBDecks->getItem(prev_sel), newname)) {
+						mainGame->RefreshDeck(mainGame->cbDBDecks);
+						mainGame->cbDBDecks->setSelected(prev_sel);
+						mainGame->stACMessage->setText(dataManager.GetSysString(1366));
+					        mainGame->PopupElement(mainGame->wACMessage, 20);
+					} else {
+						mainGame->env->addMessageBox(L"", dataManager.GetSysString(1365));
+					}
+				}
+				prev_operation = 0;
+				prev_sel = -1;
+				break;
+			}
+			case BUTTON_RENAME_DECK_CANCEL: {
+				mainGame->HideElement(mainGame->wRenameDeck);
+				prev_operation = 0;
+				prev_sel = -1;
+				break;
+			}
 			case BUTTON_DELETE_DECK: {
 				int sel = mainGame->cbDBDecks->getSelected();
 				if(sel == -1)
@@ -777,7 +817,7 @@ void DeckBuilder::FilterCards() {
 	results.clear();
 	const wchar_t* pstr = mainGame->ebCardName->getText();
 	int trycode = BufferIO::GetVal(pstr);
-	if (dataManager.GetData(trycode, 0)) {
+	if(dataManager.GetData(trycode, 0)) {
 		auto ptr = dataManager.GetCodePointer(trycode);	// verified by GetData()
 		results.push_back(ptr);
 		mainGame->scrFilter->setVisible(false);
@@ -817,73 +857,72 @@ void DeckBuilder::FilterCards() {
 		query_elements.erase(*elements_track_iterator);
 	}
 	auto strpointer = dataManager._strings.begin();
-	for (code_pointer ptr = dataManager._datas.begin(); ptr != dataManager._datas.end(); ++ptr, ++strpointer) {
+	for(code_pointer ptr = dataManager._datas.begin(); ptr != dataManager._datas.end(); ++ptr, ++strpointer) {
 		const CardDataC& data = ptr->second;
 		const CardString& text = strpointer->second;
-		if (data.type & TYPE_TOKEN)
+		if(data.type & TYPE_TOKEN)
 			continue;
-		switch (filter_type) {
+		switch(filter_type) {
 		case 1: {
-			if (!(data.type & TYPE_MONSTER) || (data.type & filter_type2) != filter_type2)
+			if(!(data.type & TYPE_MONSTER) || (data.type & filter_type2) != filter_type2)
 				continue;
-			if (filter_race && data.race != filter_race)
+			if(filter_race && data.race != filter_race)
 				continue;
-			if (filter_attrib && data.attribute != filter_attrib)
+			if(filter_attrib && data.attribute != filter_attrib)
 				continue;
-			if (filter_atktype) {
-				if ((filter_atktype == 1 && data.attack != filter_atk) || (filter_atktype == 2 && data.attack < filter_atk)
-					|| (filter_atktype == 3 && data.attack <= filter_atk) || (filter_atktype == 4 && (data.attack > filter_atk || data.attack < 0))
-					|| (filter_atktype == 5 && (data.attack >= filter_atk || data.attack < 0)) || (filter_atktype == 6 && data.attack != -2))
+			if(filter_atktype) {
+				if((filter_atktype == 1 && data.attack != filter_atk) || (filter_atktype == 2 && data.attack < filter_atk)
+				        || (filter_atktype == 3 && data.attack <= filter_atk) || (filter_atktype == 4 && (data.attack > filter_atk || data.attack < 0))
+				        || (filter_atktype == 5 && (data.attack >= filter_atk || data.attack < 0)) || (filter_atktype == 6 && data.attack != -2))
 					continue;
 			}
 			if(filter_deftype) {
 				if((filter_deftype == 1 && data.defense != filter_def) || (filter_deftype == 2 && data.defense < filter_def)
-						|| (filter_deftype == 3 && data.defense <= filter_def) || (filter_deftype == 4 && (data.defense > filter_def || data.defense < 0))
-						|| (filter_deftype == 5 && (data.defense >= filter_def || data.defense < 0)) || (filter_deftype == 6 && data.defense != -2)
-						|| (data.type & TYPE_LINK))
+				        || (filter_deftype == 3 && data.defense <= filter_def) || (filter_deftype == 4 && (data.defense > filter_def || data.defense < 0))
+				        || (filter_deftype == 5 && (data.defense >= filter_def || data.defense < 0)) || (filter_deftype == 6 && data.defense != -2)
+				        || (data.type & TYPE_LINK))
 					continue;
 			}
-			if (filter_lvtype) {
-				if ((filter_lvtype == 1 && data.level != filter_lv) || (filter_lvtype == 2 && data.level < filter_lv)
-					|| (filter_lvtype == 3 && data.level <= filter_lv) || (filter_lvtype == 4 && data.level > filter_lv)
-					|| (filter_lvtype == 5 && data.level >= filter_lv) || filter_lvtype == 6)
+			if(filter_lvtype) {
+				if((filter_lvtype == 1 && data.level != filter_lv) || (filter_lvtype == 2 && data.level < filter_lv)
+				        || (filter_lvtype == 3 && data.level <= filter_lv) || (filter_lvtype == 4 && data.level > filter_lv)
+				        || (filter_lvtype == 5 && data.level >= filter_lv) || filter_lvtype == 6)
 					continue;
 			}
-
 			if(filter_scltype) {
 				if((filter_scltype == 1 && data.lscale != filter_scl) || (filter_scltype == 2 && data.lscale < filter_scl)
-						|| (filter_scltype == 3 && data.lscale <= filter_scl) || (filter_scltype == 4 && (data.lscale > filter_scl || data.lscale == 0))
-						|| (filter_scltype == 5 && (data.lscale >= filter_scl || data.lscale == 0)) || filter_scltype == 6
-						|| !(data.type & TYPE_PENDULUM))
+				        || (filter_scltype == 3 && data.lscale <= filter_scl) || (filter_scltype == 4 && (data.lscale > filter_scl || data.lscale == 0))
+				        || (filter_scltype == 5 && (data.lscale >= filter_scl || data.lscale == 0)) || filter_scltype == 6
+				        || !(data.type & TYPE_PENDULUM))
 					continue;
 			}
 			break;
 		}
 		case 2: {
-			if (!(data.type & TYPE_SPELL))
+			if(!(data.type & TYPE_SPELL))
 				continue;
-			if (filter_type2 && data.type != filter_type2)
+			if(filter_type2 && data.type != filter_type2)
 				continue;
 			break;
 		}
 		case 3: {
-			if (!(data.type & TYPE_TRAP))
+			if(!(data.type & TYPE_TRAP))
 				continue;
-			if (filter_type2 && data.type != filter_type2)
+			if(filter_type2 && data.type != filter_type2)
 				continue;
 			break;
 		}
 		}
-		if (filter_effect && !(data.category & filter_effect))
+		if(filter_effect && !(data.category & filter_effect))
 			continue;
 		if(filter_marks && (data.link_marker & filter_marks)!= filter_marks)
 			continue;
 		if(filter_lm) {
 			if(filter_lm <= 3 && (!filterList->count(ptr->first) || (*filterList)[ptr->first] != filter_lm - 1))
 				continue;
-			if (filter_lm == 4 && data.ot != 1)
+			if(filter_lm == 4 && data.ot != 1)
 				continue;
-			if (filter_lm == 5 && data.ot != 2)
+			if(filter_lm == 5 && data.ot != 2)
 				continue;
 			if(filter_lm == 6 && data.ot != 3)
 				continue;
@@ -912,19 +951,17 @@ void DeckBuilder::FilterCards() {
 				}
 			}
 		}
-		if (is_target) {
+		if (is_target)
 			results.push_back(ptr);
-		} else {
+		else
 			continue;
-		}
 	}
 	myswprintf(result_string, L"%d", results.size());
-	if (results.size() > 7) {
+	if(results.size() > 7) {
 		mainGame->scrFilter->setVisible(true);
 		mainGame->scrFilter->setMax(results.size() - 7);
 		mainGame->scrFilter->setPos(0);
-	}
-	else {
+	} else {
 		mainGame->scrFilter->setVisible(false);
 		mainGame->scrFilter->setPos(0);
 	}

gframe/deck_manager.cpp

@@ -90,6 +90,23 @@ void DeckManager::LoadLFList() {
 	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) {

gframe/deck_manager.h

@@ -44,6 +44,7 @@ public:
 	bool LoadDeck(const wchar_t* file);
 	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);
 };
 
 extern DeckManager deckManager;

gframe/event_handler.cpp

@@ -1680,6 +1680,17 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 			}
 			break;
 		}
+		case irr::KEY_KEY_Z: {
+			if(!mainGame->dInfo.isReplay && !mainGame->HasFocus(EGUIET_EDIT_BOX)) {
+				mainGame->dInfo.isReplaySkiping = event.KeyInput.PressedDown;
+				if(mainGame->dInfo.isStarted && !mainGame->dInfo.isReplaySkiping) {
+					mainGame->gMutex.Lock();
+					mainGame->dField.RefreshAllCards();
+					mainGame->gMutex.Unlock();
+				}
+			}
+			break;
+		}
 		case irr::KEY_F1:
 		case irr::KEY_F2:
 		case irr::KEY_F3:

gframe/game.cpp

@@ -540,11 +540,21 @@ bool Game::Initialize() {
 	btnSideSort->setVisible(false);
 	btnSideReload = env->addButton(rect<s32>(440, 100, 500, 130), 0, BUTTON_SIDE_RELOAD, dataManager.GetSysString(1309));
 	btnSideReload->setVisible(false);
+	btnRenameDeck = env->addButton(rect<s32>(170, 99, 220, 120), wDeckEdit, BUTTON_RENAME_DECK, dataManager.GetSysString(1362));
 	//
 	scrFilter = env->addScrollBar(false, recti(999, 161, 1019, 629), 0, SCROLL_FILTER);
 	scrFilter->setLargeStep(10);
 	scrFilter->setSmallStep(1);
 	scrFilter->setVisible(false);
+	//rename deck
+	wRenameDeck = env->addWindow(rect<s32>(510, 200, 820, 320), false, dataManager.GetSysString(1367));
+	wRenameDeck->getCloseButton()->setVisible(false);
+	wRenameDeck->setVisible(false);
+	env->addStaticText(dataManager.GetSysString(1368), rect<s32>(20, 25, 290, 45), false, false, wRenameDeck);
+	ebREName =  env->addEditBox(L"", rect<s32>(20, 50, 290, 70), true, wRenameDeck, -1);
+	ebREName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
+	btnREYes = env->addButton(rect<s32>(70, 80, 140, 105), wRenameDeck, BUTTON_RENAME_DECK_SAVE, dataManager.GetSysString(1341));
+	btnRENo = env->addButton(rect<s32>(170, 80, 240, 105), wRenameDeck, BUTTON_RENAME_DECK_CANCEL, dataManager.GetSysString(1212));
 	//sort type
 	wSort = env->addStaticText(L"", rect<s32>(930, 132, 1020, 156), true, false, 0, -1, true);
 	cbSortType = env->addComboBox(rect<s32>(10, 2, 85, 22), wSort, COMBOBOX_SORTTYPE);
@@ -1728,6 +1738,7 @@ void Game::OnResize() {
 	btnSideSort->setRelativePosition(Resize(375, 100, 435, 130));
 	btnSideReload->setRelativePosition(Resize(440, 100, 500, 130));
 	btnDeleteDeck->setRelativePosition(Resize(225, 95, 290, 120));
+	btnRenameDeck->setRelativePosition(Resize(170, 99, 220, 120));
 
 	wLanWindow->setRelativePosition(ResizeWin(220, 100, 800, 520));
 	wCreateHost->setRelativePosition(ResizeWin(320, 100, 700, 520));

gframe/game.h

@@ -464,6 +464,12 @@ public:
 	irr::gui::IGUIStaticText* stStar;
 	irr::gui::IGUIStaticText* stSearch;
 	irr::gui::IGUIStaticText* stScale;
+	irr::gui::IGUIButton* btnRenameDeck;
+	//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;
@@ -675,6 +681,10 @@ extern HostInfo game_info;
 #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 TEXTURE_DUEL				0
 #define TEXTURE_DECK				1
 #define TEXTURE_MENU				2

strings.conf

@@ -378,6 +378,9 @@
 !system 1363 是否删除这个录像？
 !system 1364 重命名录像
 !system 1365 重命名失败，可能存在同名文件
+!system 1366 重命名成功
+!system 1367 重命名卡组
+!system 1368 卡组文件：
 !system 1370 星数↑
 !system 1371 攻击↑
 !system 1372 守备↑