Merge remote-tracking branch 'refs/remotes/Fluorohydride/master'

removed separate_clear_button

gframe/client_field.h

@@ -130,6 +130,7 @@ public:
 	int list_command;
 
 	virtual bool OnEvent(const irr::SEvent& event);
+	virtual bool OnCommonEvent(const irr::SEvent& event);
 	void GetHoverField(int x, int y);
 	void ShowMenu(int flag, int x, int y);
 	void UpdateChainButtons();

gframe/deck_con.h

@@ -11,6 +11,9 @@ namespace ygo {
 class DeckBuilder: public irr::IEventReceiver {
 public:
 	virtual bool OnEvent(const irr::SEvent& event);
+	void Initialize();
+	void Terminate();
+	void GetHoveredCard();
 	void FilterCards();
 	void ClearFilter();
 	void ClearSearch();
@@ -18,6 +21,14 @@ public:
 
 	static bool CardNameCompare(const wchar_t *sa, const wchar_t *sb);
 
+	bool push_main(code_pointer pointer, int seq = -1);
+	bool push_extra(code_pointer pointer, int seq = -1);
+	bool push_side(code_pointer pointer, int seq = -1);
+	void pop_main(int seq);
+	void pop_extra(int seq);
+	void pop_side(int seq);
+	bool check_limit(code_pointer pointer);
+
 	long long filter_effect;
 	unsigned int filter_type;
 	unsigned int filter_type2;
@@ -33,6 +44,7 @@ public:
 	unsigned int filter_scl;
 	unsigned int filter_marks;
 	int filter_lm;
+	position2di mouse_pos;
 	int hovered_code;
 	int hovered_pos;
 	int hovered_seq;
@@ -44,9 +56,9 @@ public:
 	size_t pre_extrac;
 	size_t pre_sidec;
 	code_pointer draging_pointer;
-	bool is_deleting;
-	bool is_clearing;
-	
+	int prev_deck;
+	s32 prev_operation;
+
 	std::unordered_map<int, int>* filterList;
 	std::vector<code_pointer> results;
 	wchar_t result_string[8];

gframe/drawing.cpp

@@ -211,7 +211,9 @@ void Game::DrawLinkedZones(ClientCard* pcard) {
 			driver->drawVertexPrimitiveList(&matManager.vFieldMzone[dField.hovered_controler][dField.hovered_sequence + 1], 4, matManager.iRectangle, 2);
 		}
 		if (dInfo.duel_rule >= 4) {
-			if ((mark & LINK_MARKER_TOP_LEFT && dField.hovered_sequence == 2) || (mark & LINK_MARKER_TOP && dField.hovered_sequence == 1) || (mark & LINK_MARKER_TOP_RIGHT && dField.hovered_sequence == 0)) {
+			if ((mark & LINK_MARKER_TOP_LEFT && dField.hovered_sequence == 2)
+				|| (mark & LINK_MARKER_TOP && dField.hovered_sequence == 1)
+				|| (mark & LINK_MARKER_TOP_RIGHT && dField.hovered_sequence == 0)) {
 				int mark = (dField.hovered_sequence == 2) ? LINK_MARKER_BOTTOM_RIGHT : (dField.hovered_sequence == 1) ? LINK_MARKER_BOTTOM : LINK_MARKER_BOTTOM_LEFT;
 				pcard2 = mainGame->dField.mzone[dField.hovered_controler][5];
 				if (!pcard2) {
@@ -221,7 +223,9 @@ void Game::DrawLinkedZones(ClientCard* pcard) {
 				CheckMutual(pcard2, mark);
 				driver->drawVertexPrimitiveList(&matManager.vFieldMzone[dField.hovered_controler][5], 4, matManager.iRectangle, 2);
 			}
-			if ((mark & LINK_MARKER_TOP_LEFT && dField.hovered_sequence == 4) || (mark & LINK_MARKER_TOP && dField.hovered_sequence == 3) || (mark & LINK_MARKER_TOP_RIGHT && dField.hovered_sequence == 2)) {
+			if ((mark & LINK_MARKER_TOP_LEFT && dField.hovered_sequence == 4)
+				|| (mark & LINK_MARKER_TOP && dField.hovered_sequence == 3)
+				|| (mark & LINK_MARKER_TOP_RIGHT && dField.hovered_sequence == 2)) {
 				int mark = (dField.hovered_sequence == 4) ? LINK_MARKER_BOTTOM_RIGHT : (dField.hovered_sequence == 3) ? LINK_MARKER_BOTTOM : LINK_MARKER_BOTTOM_LEFT;
 				pcard2 = mainGame->dField.mzone[dField.hovered_controler][6];
 				if (!pcard2) {

gframe/event_handler.cpp

@@ -14,17 +14,14 @@
 namespace ygo {
 
 bool ClientField::OnEvent(const irr::SEvent& event) {
+	if(OnCommonEvent(event))
+		return false;
 	switch(event.EventType) {
 	case irr::EET_GUI_EVENT: {
 		s32 id = event.GUIEvent.Caller->getID();
 		switch(event.GUIEvent.EventType) {
 		case irr::gui::EGET_BUTTON_CLICKED: {
 			switch(id) {
-			case BUTTON_CLEAR_LOG: {
-				mainGame->lstLog->clear();
-				mainGame->logParam.clear();
-				break;
-			}
 			case BUTTON_HAND1:
 			case BUTTON_HAND2:
 			case BUTTON_HAND3: {
@@ -942,13 +939,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 		}
 		case irr::gui::EGET_LISTBOX_CHANGED: {
 			switch(id) {
-			case LISTBOX_LOG: {
-				int sel = mainGame->lstLog->getSelected();
-				if(sel != -1 && (int)mainGame->logParam.size() >= sel && mainGame->logParam[sel]) {
-					mainGame->ShowCardInfo(mainGame->logParam[sel]);
-				}
-				break;
-			}
 			case LISTBOX_ANCARD: {
 				int sel = mainGame->lstANCard->getSelected();
 				if(sel != -1) {
@@ -959,18 +949,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 			}
 			break;
 		}
-		case irr::gui::EGET_LISTBOX_SELECTED_AGAIN: {
-			switch(id) {
-			case LISTBOX_LOG: {
-				int sel = mainGame->lstLog->getSelected();
-				if(sel != -1 && (int)mainGame->logParam.size() >= sel && mainGame->logParam[sel]) {
-					mainGame->wInfos->setActiveTab(0);
-				}
-				break;
-			}
-			}
-			break;
-		}
 		case irr::gui::EGET_SCROLL_BAR_CHANGED: {
 			switch(id) {
 			case SCROLL_CARD_SELECT: {
@@ -1080,17 +1058,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				}
 				break;
 			}
-			case SCROLL_CARDTEXT: {
-				u32 pos = mainGame->scrCardText->getPos();
-				mainGame->SetStaticText(mainGame->stText, mainGame->stText->getRelativePosition().getWidth()-25, mainGame->textFont, mainGame->showingtext, pos);
-				break;
-			}
-			case SCROLL_VOLUME: {
-				mainGame->gameConf.volume = (double)mainGame->srcVolume->getPos() / 100;
-				mainGame->engineSound->setSoundVolume(mainGame->gameConf.volume);
-				mainGame->engineMusic->setSoundVolume(mainGame->gameConf.volume);
-				break;
-			}
 			break;
 			}
 		}
@@ -1960,11 +1927,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 			}
 			break;
 		}
-		case irr::KEY_KEY_R: {
-			if(!event.KeyInput.PressedDown && !mainGame->HasFocus(EGUIET_EDIT_BOX))
-				mainGame->textFont->setTransparency(true);
-			break;
-		}
 		case irr::KEY_F1:
 		case irr::KEY_F2:
 		case irr::KEY_F3:
@@ -2036,14 +1998,94 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 			}
 			break;
 		}
+		default: break;
+		}
+		break;
+	}
+	default: break;
+	}
+	return false;
+}
+bool ClientField::OnCommonEvent(const irr::SEvent& event) {
+	switch(event.EventType) {
+	case irr::EET_GUI_EVENT: {
+		s32 id = event.GUIEvent.Caller->getID();
+		switch(event.GUIEvent.EventType) {
+		case irr::gui::EGET_BUTTON_CLICKED: {
+			switch(id) {
+			case BUTTON_CLEAR_LOG: {
+				mainGame->lstLog->clear();
+				mainGame->logParam.clear();
+				return true;
+				break;
+			}
+			}
+			break;
+		}
+		case irr::gui::EGET_LISTBOX_CHANGED: {
+			switch(id) {
+			case LISTBOX_LOG: {
+				int sel = mainGame->lstLog->getSelected();
+				if(sel != -1 && (int)mainGame->logParam.size() >= sel && mainGame->logParam[sel]) {
+					mainGame->ShowCardInfo(mainGame->logParam[sel]);
+				}
+				return true;
+				break;
+			}
+			}
+			break;
+		}
+		case irr::gui::EGET_LISTBOX_SELECTED_AGAIN: {
+			switch(id) {
+			case LISTBOX_LOG: {
+				int sel = mainGame->lstLog->getSelected();
+				if(sel != -1 && (int)mainGame->logParam.size() >= sel && mainGame->logParam[sel]) {
+					mainGame->wInfos->setActiveTab(0);
+				}
+				return true;
+				break;
+			}
+			}
+			break;
+		}
+		case irr::gui::EGET_SCROLL_BAR_CHANGED: {
+			switch(id) {
+			case SCROLL_CARDTEXT: {
+				u32 pos = mainGame->scrCardText->getPos();
+				mainGame->SetStaticText(mainGame->stText, mainGame->stText->getRelativePosition().getWidth() - 25, mainGame->textFont, mainGame->showingtext, pos);
+				return true;
+				break;
+			}
+			case SCROLL_VOLUME: {
+				mainGame->gameConf.volume = (double)mainGame->srcVolume->getPos() / 100;
+				mainGame->engineSound->setSoundVolume(mainGame->gameConf.volume);
+				mainGame->engineMusic->setSoundVolume(mainGame->gameConf.volume);
+				break;
+			}
+			}
+			break;
+		}
+		default: break;
+		}
+		break;
+	}
+	case irr::EET_KEY_INPUT_EVENT: {
+		switch(event.KeyInput.Key) {
+		case irr::KEY_KEY_R: {
+			if(!event.KeyInput.PressedDown && !mainGame->HasFocus(EGUIET_EDIT_BOX))
+				mainGame->textFont->setTransparency(true);
+			break;
+		}
 		case irr::KEY_F9: {
 			if(!event.KeyInput.PressedDown && !mainGame->HasFocus(EGUIET_EDIT_BOX))
 				mainGame->textFont->setTransparency(true);
+			return true;
 			break;
 		}
 		case irr::KEY_ESCAPE: {
 			if(!mainGame->HasFocus(EGUIET_EDIT_BOX))
 				mainGame->device->minimizeWindow();
+			return true;
 			break;
 		}
 		default: break;

gframe/game.cpp

@@ -526,11 +526,8 @@ bool Game::Initialize() {
 	ebCardName = env->addEditBox(L"", rect<s32>(260, 60 + 100 / 6, 390, 80 + 100 / 6), true, wFilter, EDITBOX_KEYWORD);
 	ebCardName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
 	btnEffectFilter = env->addButton(rect<s32>(345, 20 + 50 / 6, 390, 60 + 75 / 6), wFilter, BUTTON_EFFECT_FILTER, dataManager.GetSysString(1326));
-	btnStartFilter = env->addButton(rect<s32>(205, 80 + 125 / 6, 390, 100 + 125 / 6), wFilter, BUTTON_START_FILTER, dataManager.GetSysString(1327));
-	if(gameConf.separate_clear_button) {
-		btnStartFilter->setRelativePosition(rect<s32>(260, 80 + 125 / 6, 390, 100 + 125 / 6));
-		btnClearFilter = env->addButton(rect<s32>(205, 80 + 125 / 6, 255, 100 + 125 / 6), wFilter, BUTTON_CLEAR_FILTER, dataManager.GetSysString(1304));
-	}
+	btnStartFilter = env->addButton(rect<s32>(260, 80 + 125 / 6, 390, 100 + 125 / 6), wFilter, BUTTON_START_FILTER, dataManager.GetSysString(1327));
+	btnClearFilter = env->addButton(rect<s32>(205, 80 + 125 / 6, 255, 100 + 125 / 6), wFilter, BUTTON_CLEAR_FILTER, dataManager.GetSysString(1304));
 	wCategories = env->addWindow(rect<s32>(450, 60, 1000, 270), false, dataManager.strBuffer);
 	wCategories->getCloseButton()->setVisible(false);
 	wCategories->setDrawTitlebar(false);
@@ -1019,7 +1016,6 @@ void Game::LoadConfig() {
 	gameConf.enablemusic = true;
 	fseek(fp, 0, SEEK_END);
 	gameConf.draw_field_spell = 1;
-	gameConf.separate_clear_button = 1;
 	fseek(fp, 0, SEEK_END);
 	int fsize = ftell(fp);
 	fseek(fp, 0, SEEK_SET);
@@ -1072,8 +1068,6 @@ void Game::LoadConfig() {
 			gameConf.chkHideHintButton = atoi(valbuf);
 		} else if(!strcmp(strbuf, "draw_field_spell")) {
 			gameConf.draw_field_spell = atoi(valbuf);
-		} else if(!strcmp(strbuf, "separate_clear_button")) {
-			gameConf.separate_clear_button = atoi(valbuf);
 		} else if(!strcmp(strbuf, "enable_sound")) {
  			gameConf.enablesound = atoi(valbuf) > 0;
 		} else if (!strcmp(strbuf, "skin_index")) {
@@ -1133,7 +1127,6 @@ void Game::SaveConfig() {
 	fprintf(fp, "hide_setname = %d\n", ((gameConf.chkHideSetname) ? 1 : 0));
 	fprintf(fp, "hide_hint_button = %d\n", ((chkHideHintButton->isChecked()) ? 1 : 0));
 	fprintf(fp, "draw_field_spell = %d\n", gameConf.draw_field_spell);
-	fprintf(fp, "separate_clear_button = %d\n", gameConf.separate_clear_button);
 	fprintf(fp, "skin_index = %d\n", gameConf.skin_index);
 	fprintf(fp, "enable_sound = %d\n", ((chkEnableSound->isChecked()) ? 1 : 0));
 	fprintf(fp, "enable_music = %d\n", ((chkEnableMusic->isChecked()) ? 1 : 0));
@@ -1552,3 +1545,4 @@ recti Game::ResizeElem(s32 x, s32 y, s32 x2, s32 y2)
 }
 
 }
+

gframe/game.h

@@ -36,7 +36,6 @@ struct Config {
 	int chkHideSetname;
 	int chkHideHintButton;
 	int draw_field_spell;
-	int separate_clear_button;
 
 	bool enablesound;
 	double volume;

gframe/menu_handler.cpp

@@ -259,46 +259,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					mainGame->ebDeckname->setText(L"");
 				}
 				mainGame->HideElement(mainGame->wMainMenu);
-				mainGame->is_building = true;
-				mainGame->is_siding = false;
-				mainGame->wInfos->setVisible(true);
-				mainGame->wCardImg->setVisible(true);
-				mainGame->wDeckEdit->setVisible(true);
-				mainGame->wFilter->setVisible(true);
-				mainGame->wSort->setVisible(true);
-				mainGame->btnLeaveGame->setVisible(true);
-				mainGame->btnLeaveGame->setText(dataManager.GetSysString(1306));
-				mainGame->btnSideOK->setVisible(false);
-				mainGame->deckBuilder.filterList = deckManager._lfList[0].content;
-				mainGame->cbDBLFList->setSelected(0);
-				mainGame->cbCardType->setSelected(0);
-				mainGame->cbCardType2->setSelected(0);
-				mainGame->cbAttribute->setSelected(0);
-				mainGame->cbRace->setSelected(0);
-				mainGame->ebAttack->setText(L"");
-				mainGame->ebDefense->setText(L"");
-				mainGame->ebStar->setText(L"");
-				mainGame->ebScale->setText(L"");
-				mainGame->cbCardType2->setEnabled(false);
-				mainGame->cbAttribute->setEnabled(false);
-				mainGame->cbRace->setEnabled(false);
-				mainGame->ebAttack->setEnabled(false);
-				mainGame->ebDefense->setEnabled(false);
-				mainGame->ebStar->setEnabled(false);
-				mainGame->ebScale->setEnabled(false);
-				mainGame->deckBuilder.filter_effect = 0;
-				mainGame->deckBuilder.filter_marks = 0;
-				mainGame->deckBuilder.result_string[0] = L'0';
-				mainGame->deckBuilder.result_string[1] = 0;
-				mainGame->deckBuilder.results.clear();
-				mainGame->deckBuilder.is_draging = false;
-				mainGame->deckBuilder.is_deleting = false;
-				mainGame->deckBuilder.is_clearing = false;
-				mainGame->device->setEventReceiver(&mainGame->deckBuilder);
-				for(int i = 0; i < 32; ++i)
-					mainGame->chkCategory[i]->setChecked(false);
-				for(int i = 0; i < 8; i++)
-					mainGame->btnMark[i]->setPressed(false);
+				mainGame->deckBuilder.Initialize();
 				break;
 			}
 			}