fixed chain buttons

gframe/client_field.cpp

@@ -1138,7 +1138,6 @@ bool ClientField::ShowSelectSum(bool panelmode) {
 		if(CheckSelectSum()) {
 			if(selectsum_cards.size() == 0 || selectable_cards.size() == 0) {
 				SetResponseSelectedCards();
-				ShowCancelOrFinishButton(0);
 				if(mainGame->wCardSelect->isVisible())
 					mainGame->HideElement(mainGame->wCardSelect, true);
 				else {
@@ -1159,7 +1158,6 @@ bool ClientField::ShowSelectSum(bool panelmode) {
 		if(CheckSelectSum()) {
 			if(selectsum_cards.size() == 0 || selectable_cards.size() == 0) {
 				SetResponseSelectedCards();
-				ShowCancelOrFinishButton(0);
 				DuelClient::SendResponse();
 				return true;
 			} else {
@@ -1174,11 +1172,6 @@ bool ClientField::ShowSelectSum(bool panelmode) {
 		} else
 			select_ready = false;
 	}
-	if (select_ready) {
-		ShowCancelOrFinishButton(1);
-	} else {
-		ShowCancelOrFinishButton(0);
-	}
 	return false;
 }
 bool ClientField::CheckSelectSum() {

gframe/client_field.h

@@ -130,7 +130,6 @@ public:
 	void GetHoverField(int x, int y);
 	void ShowMenu(int flag, int x, int y);
 	void UpdateChainButtons();
-	void ShowCancelOrFinishButton(int buttonOp);
 	void SetResponseSelectedCards() const;
 };
 

gframe/deck_con.cpp

@@ -495,7 +495,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 			if(!mainGame->is_siding) {
 				if((hovered_pos == 1 && (draging_pointer->second.type & 0x802040)) || (hovered_pos == 2 && !(draging_pointer->second.type & 0x802040)))
 					hovered_pos = 0;
-				if((hovered_pos == 1 || (hovered_pos == 0 && click_pos == 1)) && deckManager.current_deck.main.size() < 100) {
+				if((hovered_pos == 1 || (hovered_pos == 0 && click_pos == 1)) && deckManager.current_deck.main.size() < 60) {
 					if(hovered_seq == -1)
 						deckManager.current_deck.main.push_back(draging_pointer);
 					else if(hovered_seq < (int)deckManager.current_deck.main.size() && hovered_pos)
@@ -616,7 +616,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					if((draging_pointer->second.type & 0x802040) && deckManager.current_deck.extra.size() < 15) {
 						deckManager.current_deck.extra.push_back(draging_pointer);
 						is_draging = false;
-					} else if(!(draging_pointer->second.type & 0x802040) && deckManager.current_deck.main.size() < 100) {
+					} else if(!(draging_pointer->second.type & 0x802040) && deckManager.current_deck.main.size() < 60) {
 						deckManager.current_deck.main.push_back(draging_pointer);
 						is_draging = false;
 					}
@@ -648,7 +648,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 						break;
 					if((draging_pointer->second.type & 0x802040) && deckManager.current_deck.extra.size() < 15) {
 						deckManager.current_deck.extra.push_back(draging_pointer);
-					} else if(!(draging_pointer->second.type & 0x802040) && deckManager.current_deck.main.size() < 100) {
+					} else if(!(draging_pointer->second.type & 0x802040) && deckManager.current_deck.main.size() < 60) {
 						deckManager.current_deck.main.push_back(draging_pointer);
 					} else if (deckManager.current_deck.side.size() < 15) {
 						deckManager.current_deck.side.push_back(draging_pointer);
@@ -686,7 +686,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 			if (limit <= 0)
 				break;
 			if (hovered_pos == 1) {
-				if (deckManager.current_deck.main.size() < 100)
+				if (deckManager.current_deck.main.size() < 60)
 					deckManager.current_deck.main.push_back(draging_pointer);
 				else if (deckManager.current_deck.side.size() < 15)
 					deckManager.current_deck.side.push_back(draging_pointer);
@@ -701,13 +701,13 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				else {
 					if ((draging_pointer->second.type & 0x802040) && deckManager.current_deck.extra.size() < 15)
 						deckManager.current_deck.extra.push_back(draging_pointer);
-					else if (!(draging_pointer->second.type & 0x802040) && deckManager.current_deck.main.size() < 100)
+					else if (!(draging_pointer->second.type & 0x802040) && deckManager.current_deck.main.size() < 60)
 						deckManager.current_deck.main.push_back(draging_pointer);
 				}
 			} else {
 				if ((draging_pointer->second.type & 0x802040) && deckManager.current_deck.extra.size() < 15)
 					deckManager.current_deck.extra.push_back(draging_pointer);
-				else if (!(draging_pointer->second.type & 0x802040) && deckManager.current_deck.main.size() < 100)
+				else if (!(draging_pointer->second.type & 0x802040) && deckManager.current_deck.main.size() < 60)
 					deckManager.current_deck.main.push_back(draging_pointer);
 				else if (deckManager.current_deck.side.size() < 15)
 					deckManager.current_deck.side.push_back(draging_pointer);

gframe/duelclient.cpp

@@ -309,7 +309,6 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->btnChainIgnore->setVisible(false);
 		mainGame->btnChainAlways->setVisible(false);
 		mainGame->btnChainWhenAvail->setVisible(false);
-		mainGame->btnCancelOrFinish->setVisible(false);
 		mainGame->deckBuilder.result_string[0] = L'0';
 		mainGame->deckBuilder.result_string[1] = 0;
 		mainGame->deckBuilder.results.clear();
@@ -597,7 +596,6 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->btnChainIgnore->setVisible(false);
 		mainGame->btnChainAlways->setVisible(false);
 		mainGame->btnChainWhenAvail->setVisible(false);
-		mainGame->btnCancelOrFinish->setVisible(false);
 		mainGame->stMessage->setText(dataManager.GetSysString(1500));
 		mainGame->PopupElement(mainGame->wMessage);
 		mainGame->gMutex.Unlock();
@@ -627,7 +625,6 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->btnChainIgnore->setVisible(false);
 		mainGame->btnChainAlways->setVisible(false);
 		mainGame->btnChainWhenAvail->setVisible(false);
-		mainGame->btnCancelOrFinish->setVisible(false);
 		time_t nowtime = time(NULL);
 		struct tm *localedtime = localtime(&nowtime);
 		char timebuf[40];
@@ -1270,11 +1267,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			mainGame->stHintMsg->setText(textBuffer);
 			mainGame->stHintMsg->setVisible(true);
 		}
-		if (mainGame->dField.select_cancelable) {
-			mainGame->dField.ShowCancelOrFinishButton(1);
-		} else {
-			mainGame->dField.ShowCancelOrFinishButton(0);
-		}
 		return false;
 	}
 	case MSG_SELECT_CHAIN: {
@@ -1503,9 +1495,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		mainGame->gMutex.Lock();
 		mainGame->stHintMsg->setText(textBuffer);
 		mainGame->stHintMsg->setVisible(true);
-		if (mainGame->dField.select_cancelable) {
-			mainGame->dField.ShowCancelOrFinishButton(1);
-		}
 		mainGame->gMutex.Unlock();
 		return false;
 	}
@@ -1962,16 +1951,15 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			mainGame->btnLeaveGame->setVisible(true);
 		}
 		if(!mainGame->dInfo.isReplay && mainGame->dInfo.player_type < 7) {
-			if(mainGame->gameConf.control_mode == 0) {
+			if(!mainGame->chkHideHintButton->isChecked()) {
 				mainGame->btnChainIgnore->setVisible(true);
 				mainGame->btnChainAlways->setVisible(true);
 				mainGame->btnChainWhenAvail->setVisible(true);
-				mainGame->dField.UpdateChainButtons();
+				//mainGame->dField.UpdateChainButtons();
 			} else {
 				mainGame->btnChainIgnore->setVisible(false);
 				mainGame->btnChainAlways->setVisible(false);
 				mainGame->btnChainWhenAvail->setVisible(false);
-				mainGame->btnCancelOrFinish->setVisible(false);
 			}
 		}
 		if(mainGame->dInfo.isTag && mainGame->dInfo.turn != 1) {

gframe/event_handler.cpp

@@ -153,29 +153,24 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				case MSG_WAITING: {
 					if (mainGame->wCardSelect->isVisible()) {
 						mainGame->HideElement(mainGame->wCardSelect);
-						ShowCancelOrFinishButton(0);
 					}
 					break;
 				}
 				case MSG_SELECT_BATTLECMD: {
 					if (mainGame->wCardSelect->isVisible()) {
 						mainGame->HideElement(mainGame->wCardSelect);
-						ShowCancelOrFinishButton(0);
 					}
 					if (mainGame->wOptions->isVisible()) {
 						mainGame->HideElement(mainGame->wOptions);
-						ShowCancelOrFinishButton(0);
 					}
 					break;
 				}
 				case MSG_SELECT_IDLECMD: {
 					if (mainGame->wCardSelect->isVisible()) {
 						mainGame->HideElement(mainGame->wCardSelect);
-						ShowCancelOrFinishButton(0);
 					}
 					if (mainGame->wOptions->isVisible()) {
 						mainGame->HideElement(mainGame->wOptions);
-						ShowCancelOrFinishButton(0);
 					}
 					break;
 				}
@@ -192,7 +187,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					if (selected_cards.size() == 0) {
 						if (select_cancelable) {
 							DuelClient::SetResponseI(-1);
-							ShowCancelOrFinishButton(0);
 							if (mainGame->wCardSelect->isVisible())
 								mainGame->HideElement(mainGame->wCardSelect, true);
 							else
@@ -202,13 +196,11 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					}
 					if (mainGame->wQuery->isVisible()) {
 						SetResponseSelectedCards();
-						ShowCancelOrFinishButton(0);
 						mainGame->HideElement(mainGame->wQuery, true);
 						break;
 					}
 					if (select_ready) {
 						SetResponseSelectedCards();
-						ShowCancelOrFinishButton(0);
 						if (mainGame->wCardSelect->isVisible())
 							mainGame->HideElement(mainGame->wCardSelect, true);
 						else
@@ -229,7 +221,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					}
 					if (mainGame->wQuery->isVisible()) {
 						SetResponseSelectedCards();
-						ShowCancelOrFinishButton(0);
 						mainGame->HideElement(mainGame->wQuery, true);
 						break;
 					}
@@ -238,7 +229,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				case MSG_SELECT_SUM: {
 					if (mainGame->wQuery->isVisible()) {
 						SetResponseSelectedCards();
-						ShowCancelOrFinishButton(0);
 						mainGame->HideElement(mainGame->wQuery, true);
 						break;
 					}
@@ -249,21 +239,17 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 						break;
 					if (mainGame->wCardSelect->isVisible()) {
 						mainGame->HideElement(mainGame->wCardSelect);
-						ShowCancelOrFinishButton(0);
 						break;
 					}
 					if (mainGame->wQuery->isVisible()) {
 						DuelClient::SetResponseI(-1);
-						ShowCancelOrFinishButton(0);
 						mainGame->HideElement(mainGame->wQuery, true);
 					}
 					else {
 						mainGame->PopupElement(mainGame->wQuery);
-						ShowCancelOrFinishButton(0);
 					}
 					if (mainGame->wOptions->isVisible()) {
 						DuelClient::SetResponseI(-1);
-						ShowCancelOrFinishButton(0);
 						mainGame->HideElement(mainGame->wOptions);
 					}
 					break;
@@ -304,7 +290,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				case MSG_SELECT_CHAIN: {
 					mainGame->HideElement(mainGame->wQuery);
 					if (!chain_forced) {
-						ShowCancelOrFinishButton(1);
 					}
 					break;
 				}
@@ -329,14 +314,12 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				case MSG_SELECT_CHAIN: {
 					DuelClient::SetResponseI(-1);
 					mainGame->HideElement(mainGame->wQuery, true);
-					ShowCancelOrFinishButton(0);
 					break;
 				}
 				case MSG_SELECT_CARD:
 				case MSG_SELECT_TRIBUTE:
 				case MSG_SELECT_SUM: {
 					SetResponseSelectedCards();
-					ShowCancelOrFinishButton(0);
 					mainGame->HideElement(mainGame->wQuery, true);
 					break;
 				}
@@ -424,7 +407,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 			case BUTTON_CMD_ACTIVATE:
 			case BUTTON_CMD_RESET: {
 				mainGame->wCmdMenu->setVisible(false);
-				ShowCancelOrFinishButton(0);
 				if(!list_command) {
 					int index = -1;
 					select_options.clear();
@@ -555,7 +537,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					list_command = COMMAND_SPSUMMON;
 					mainGame->wCardSelect->setText(dataManager.GetSysString(509));
 					ShowSelectCard();
-					ShowCancelOrFinishButton(1);
 				}
 				break;
 			}
@@ -756,19 +737,13 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					int sel = selected_cards.size();
 					if (sel >= select_max) {
 						SetResponseSelectedCards();
-						ShowCancelOrFinishButton(0);
 						mainGame->HideElement(mainGame->wCardSelect, true);
 					} else if (sel >= select_min) {
 						select_ready = true;
 						mainGame->btnSelectOK->setVisible(true);
-						ShowCancelOrFinishButton(2);
 					} else {
 						select_ready = false;
 						mainGame->btnSelectOK->setVisible(false);
-						if (select_cancelable && sel == 0)
-							ShowCancelOrFinishButton(1);
-						else
-							ShowCancelOrFinishButton(0);
 					}
 					break;
 				}
@@ -825,7 +800,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				if(mainGame->dInfo.curMsg == MSG_SELECT_CARD || mainGame->dInfo.curMsg == MSG_SELECT_SUM) {
 					if(select_ready) {
 						SetResponseSelectedCards();
-						ShowCancelOrFinishButton(0);
 						mainGame->HideElement(mainGame->wCardSelect, true);
 					}
 					break;
@@ -1121,12 +1095,13 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 			s32 y = pos.Y;
 			if(x < 300)
 				break;
-			if(mainGame->gameConf.control_mode == 1) {
-				mainGame->always_chain = event.MouseInput.isLeftPressed();
-				mainGame->ignore_chain = false;
-				mainGame->chain_when_avail = false;
-				UpdateChainButtons();
-			}
+			if(mainGame->btnChainAlways->isPressed())
+				mainGame->always_chain = true;
+			else
+				mainGame->always_chain = false;
+			mainGame->ignore_chain = false;
+			mainGame->chain_when_avail = false;
+			//UpdateChainButtons();
 			if(mainGame->wCmdMenu->isVisible() && !mainGame->wCmdMenu->getRelativePosition().isPointInside(mousepos))
 				mainGame->wCmdMenu->setVisible(false);
 			if(panel && panel->isVisible())
@@ -1427,16 +1402,13 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				}
 				if (min >= select_max) {
 					SetResponseSelectedCards();
-					ShowCancelOrFinishButton(0);
 					DuelClient::SendResponse();
 				} else if (max >= select_min) {
 					if(selected_cards.size() == selectable_cards.size()) {
 						SetResponseSelectedCards();
-						ShowCancelOrFinishButton(0);
 						DuelClient::SendResponse();
 					} else {
 						select_ready = true;
-						ShowCancelOrFinishButton(2);
 						if(mainGame->dInfo.curMsg == MSG_SELECT_TRIBUTE) {
 							wchar_t wbuf[256], *pwbuf = wbuf;
 							BufferIO::CopyWStrRef(dataManager.GetSysString(209), pwbuf, 256);
@@ -1448,10 +1420,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					}
 				} else {
 					select_ready = false;
-					if (select_cancelable && min == 0)
-						ShowCancelOrFinishButton(1);
-					else
-						ShowCancelOrFinishButton(0);
 				}
 				break;
 			}
@@ -1498,13 +1466,14 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 			s32 y = event.MouseInput.Y;
 			irr::core::position2di pos(x, y);
 			irr::gui::IGUIElement* root = mainGame->env->getRootGUIElement();
-			if(root->getElementFromPoint(pos) == mainGame->btnCancelOrFinish)
-				mainGame->chkHideHintButton->setChecked(true);
-			if(mainGame->gameConf.control_mode == 1 && event.MouseInput.X > 300) {
-				mainGame->ignore_chain = event.MouseInput.isRightPressed();
+			if(event.MouseInput.X > 300) {
+				if (mainGame->btnChainIgnore->isPressed())
+					mainGame->ignore_chain = true;
+				else
+					mainGame->ignore_chain = false;
 				mainGame->always_chain = false;
 				mainGame->chain_when_avail = false;
-				UpdateChainButtons();
+				//UpdateChainButtons();
 			}
 			mainGame->wCmdMenu->setVisible(false);
 			if(mainGame->fadingList.size())
@@ -1513,29 +1482,24 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 			case MSG_WAITING: {
 				if(mainGame->wCardSelect->isVisible()) {
 					mainGame->HideElement(mainGame->wCardSelect);
-					ShowCancelOrFinishButton(0);
 				}
 				break;
 			}
 			case MSG_SELECT_BATTLECMD: {
 				if(mainGame->wCardSelect->isVisible()) {
 					mainGame->HideElement(mainGame->wCardSelect);
-					ShowCancelOrFinishButton(0);
 				}
 				if(mainGame->wOptions->isVisible()) {
 					mainGame->HideElement(mainGame->wOptions);
-					ShowCancelOrFinishButton(0);
 				}
 				break;
 			}
 			case MSG_SELECT_IDLECMD: {
 				if(mainGame->wCardSelect->isVisible()) {
 					mainGame->HideElement(mainGame->wCardSelect);
-					ShowCancelOrFinishButton(0);
 				}
 				if(mainGame->wOptions->isVisible()) {
 					mainGame->HideElement(mainGame->wOptions);
-					ShowCancelOrFinishButton(0);
 				}
 				break;
 			}
@@ -1552,7 +1516,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				if(selected_cards.size() == 0) {
 					if(select_cancelable) {
 						DuelClient::SetResponseI(-1);
-						ShowCancelOrFinishButton(0);
 						if(mainGame->wCardSelect->isVisible())
 							mainGame->HideElement(mainGame->wCardSelect, true);
 						else
@@ -1562,13 +1525,11 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				}
 				if(mainGame->wQuery->isVisible()) {
 					SetResponseSelectedCards();
-					ShowCancelOrFinishButton(0);
 					mainGame->HideElement(mainGame->wQuery, true);
 					break;
 				}
 				if(select_ready) {
 					SetResponseSelectedCards();
-					ShowCancelOrFinishButton(0);
 					if(mainGame->wCardSelect->isVisible())
 						mainGame->HideElement(mainGame->wCardSelect, true);
 					else
@@ -1589,7 +1550,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				}
 				if(mainGame->wQuery->isVisible()) {
 					SetResponseSelectedCards();
-					ShowCancelOrFinishButton(0);
 					mainGame->HideElement(mainGame->wQuery, true);
 					break;
 				}
@@ -1598,7 +1558,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 			case MSG_SELECT_SUM: {
 				if(mainGame->wQuery->isVisible()) {
 					SetResponseSelectedCards();
-					ShowCancelOrFinishButton(0);
 					mainGame->HideElement(mainGame->wQuery, true);
 					break;
 				}
@@ -1609,20 +1568,16 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					break;
 				if(mainGame->wCardSelect->isVisible()) {
 					mainGame->HideElement(mainGame->wCardSelect);
-					ShowCancelOrFinishButton(0);
 					break;
 				}
 				if(mainGame->wQuery->isVisible()) {
 					DuelClient::SetResponseI(-1);
-					ShowCancelOrFinishButton(0);
 					mainGame->HideElement(mainGame->wQuery, true);
 				} else {
 					mainGame->PopupElement(mainGame->wQuery);
-					ShowCancelOrFinishButton(0);
 				}
 				if(mainGame->wOptions->isVisible()) {
 					DuelClient::SetResponseI(-1);
-					ShowCancelOrFinishButton(0);
 					mainGame->HideElement(mainGame->wOptions);
 				}
 				break;
@@ -1650,13 +1605,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 			if(x < 300) {
 				irr::gui::IGUIElement* root = mainGame->env->getRootGUIElement();
 				irr::gui::IGUIElement* elem = root->getElementFromPoint(pos);
-				if(elem == mainGame->btnCancelOrFinish) {
-					should_show_tip = true;
-					myswprintf(formatBuffer, dataManager.GetSysString(1700), mainGame->btnCancelOrFinish->getText());
-					mainGame->stTip->setText(formatBuffer);
-					irr::core::dimension2d<unsigned int> dtip = mainGame->textFont->getDimension(formatBuffer) + irr::core::dimension2d<unsigned int>(10, 10);
-					mainGame->stTip->setRelativePosition(recti(x - 10 - dtip.Width, y - 10 - dtip.Height, x - 10, y - 10));
-				}
 				mainGame->stTip->setVisible(should_show_tip);
 				break;
 			}
@@ -1846,22 +1794,22 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 		case irr::EMIE_LMOUSE_PRESSED_DOWN: {
 			if(!mainGame->dInfo.isStarted)
 				break;
-			if(mainGame->gameConf.control_mode == 1 && event.MouseInput.X > 300) {
+			if(event.MouseInput.X > 300) {
 				mainGame->always_chain = event.MouseInput.isLeftPressed();
 				mainGame->ignore_chain = false;
 				mainGame->chain_when_avail = false;
-				UpdateChainButtons();
+				//UpdateChainButtons();
 			}
 			break;
 		}
 		case irr::EMIE_RMOUSE_PRESSED_DOWN: {
 			if(!mainGame->dInfo.isStarted)
 				break;
-			if(mainGame->gameConf.control_mode == 1 && event.MouseInput.X > 300) {
+			if(event.MouseInput.X > 300) {
 				mainGame->ignore_chain = event.MouseInput.isRightPressed();
 				mainGame->always_chain = false;
 				mainGame->chain_when_avail = false;
-				UpdateChainButtons();
+				//UpdateChainButtons();
 			}
 			break; 
 		}
@@ -1873,35 +1821,28 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 	case irr::EET_KEY_INPUT_EVENT: {
 		switch(event.KeyInput.Key) {
 		case irr::KEY_KEY_A: {
-			if(mainGame->gameConf.control_mode == 0) {
-				mainGame->always_chain = event.KeyInput.PressedDown;
-				mainGame->ignore_chain = false;
-				mainGame->chain_when_avail = false;
-				UpdateChainButtons();
-			}
+			mainGame->always_chain = event.KeyInput.PressedDown;
+			mainGame->ignore_chain = false;
+			mainGame->chain_when_avail = false;
+			//UpdateChainButtons();
 			break;
 		}
 		case irr::KEY_KEY_S: {
-			if(mainGame->gameConf.control_mode == 0) {
-				mainGame->ignore_chain = event.KeyInput.PressedDown;
-				mainGame->always_chain = false;
-				mainGame->chain_when_avail = false;
-				UpdateChainButtons();
-			}
+			mainGame->ignore_chain = event.KeyInput.PressedDown;
+			mainGame->always_chain = false;
+			mainGame->chain_when_avail = false;
+			//UpdateChainButtons();
 			break;
 		}
 		case irr::KEY_KEY_D: {
-			if(mainGame->gameConf.control_mode == 0) {
-				mainGame->chain_when_avail = event.KeyInput.PressedDown;
-				mainGame->always_chain = false;
-				mainGame->ignore_chain = false;
-				UpdateChainButtons();
-			}
+			mainGame->chain_when_avail = event.KeyInput.PressedDown;
+			mainGame->always_chain = false;
+			mainGame->ignore_chain = false;
+			//UpdateChainButtons();
 			break;
 		}
 		case irr::KEY_KEY_R: {
-			if(mainGame->gameConf.control_mode == 0
-				&& !event.KeyInput.PressedDown && !mainGame->HasFocus(EGUIET_EDIT_BOX))
+			if(!event.KeyInput.PressedDown && !mainGame->HasFocus(EGUIET_EDIT_BOX))
 				mainGame->textFont->setTransparency(true);
 			break;
 		}
@@ -1977,8 +1918,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 			break;
 		}
 		case irr::KEY_F9: {
-			if(mainGame->gameConf.control_mode == 1
-				&& !event.KeyInput.PressedDown && !mainGame->HasFocus(EGUIET_EDIT_BOX))
+			if(!event.KeyInput.PressedDown && !mainGame->HasFocus(EGUIET_EDIT_BOX))
 				mainGame->textFont->setTransparency(true);
 			break;
 		}
@@ -2229,26 +2169,6 @@ void ClientField::UpdateChainButtons() {
 		mainGame->btnChainWhenAvail->setPressed(mainGame->chain_when_avail);
 	}
 }
-void ClientField::ShowCancelOrFinishButton(int buttonOp) {
-	if (!mainGame->chkHideHintButton->isChecked() && !mainGame->dInfo.isReplay) {
-		switch (buttonOp) {
-		case 1:
-			mainGame->btnCancelOrFinish->setText(dataManager.GetSysString(1295));
-			mainGame->btnCancelOrFinish->setVisible(true);
-			break;
-		case 2:
-			mainGame->btnCancelOrFinish->setText(dataManager.GetSysString(1296));
-			mainGame->btnCancelOrFinish->setVisible(true);
-			break;
-		case 0:
-		default:
-			mainGame->btnCancelOrFinish->setVisible(false);
-			break;
-		}
-	} else {
-		mainGame->btnCancelOrFinish->setVisible(false);
-	}
-}
 void ClientField::SetResponseSelectedCards() const {
 	unsigned char respbuf[64];
 	respbuf[0] = selected_cards.size();

gframe/game.cpp

@@ -589,9 +589,6 @@ bool Game::Initialize() {
 	btnChainIgnore->setVisible(false);
 	btnChainAlways->setVisible(false);
 	btnChainWhenAvail->setVisible(false);
-	//cancel or finish
-	btnCancelOrFinish = env->addButton(rect<s32>(205, 230, 295, 265), 0, BUTTON_CANCEL_OR_FINISH, dataManager.GetSysString(1295));
-	btnCancelOrFinish->setVisible(false);
 	//leave/surrender/exit
 	btnLeaveGame = env->addButton(rect<s32>(205, 5, 295, 80), 0, BUTTON_LEAVE_GAME, L"");
 	btnLeaveGame->setVisible(false);
@@ -980,7 +977,6 @@ void Game::LoadConfig() {
 	gameConf.chkIgnore2 = 0;
 	gameConf.chkHideSetname = 0;
 	gameConf.chkHideHintButton = 0;
-	gameConf.control_mode = 0;
 	gameConf.skin_index = -1;
 	gameConf.enablesound = true;
 	gameConf.volume = 1.0;
@@ -1037,8 +1033,6 @@ void Game::LoadConfig() {
 			gameConf.chkHideSetname = atoi(valbuf);
 		} else if(!strcmp(strbuf, "hide_hint_button")) {
 			gameConf.chkHideHintButton = atoi(valbuf);
-		} else if(!strcmp(strbuf, "control_mode")) {
-			gameConf.control_mode = atoi(valbuf);
 		} else if(!strcmp(strbuf, "draw_field_spell")) {
 			gameConf.draw_field_spell = atoi(valbuf);
 		} else if(!strcmp(strbuf, "separate_clear_button")) {
@@ -1102,8 +1096,6 @@ void Game::SaveConfig() {
 	fprintf(fp, "mute_spectators = %d\n", ((mainGame->chkIgnore2->isChecked()) ? 1 : 0));
 	fprintf(fp, "hide_setname = %d\n", (gameConf.chkHideSetname));
 	fprintf(fp, "hide_hint_button = %d\n", ((mainGame->chkHideHintButton->isChecked()) ? 1 : 0));
-	fprintf(fp, "#control_mode = 0: Key A/S/D/R Chain Buttons. control_mode = 1: MouseLeft/MouseRight/NULL/F9 Without Chain Buttons\n");
-	fprintf(fp, "control_mode = %d\n", gameConf.control_mode);
 	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);
@@ -1306,7 +1298,6 @@ void Game::CloseDuelWindow() {
 	btnChainIgnore->setVisible(false);
 	btnChainAlways->setVisible(false);
 	btnChainWhenAvail->setVisible(false);
-	btnCancelOrFinish->setVisible(false);
 	wChat->setVisible(false);
 	lstLog->clear();
 	logParam.clear();
@@ -1424,7 +1415,6 @@ void Game::OnResize()
 	btnChainAlways->setRelativePosition(Resize(205, 140, 295, 175));
 	btnChainIgnore->setRelativePosition(Resize(205, 100, 295, 135));
 	btnChainWhenAvail->setRelativePosition(Resize(205, 180, 295, 215));
-	btnCancelOrFinish->setRelativePosition(Resize(205, 230, 295, 265));
 }
 recti Game::Resize(s32 x, s32 y, s32 x2, s32 y2)
 {

gframe/game.h

@@ -34,7 +34,6 @@ struct Config {
 	int chkIgnore2;
 	int chkHideSetname;
 	int chkHideHintButton;
-	int control_mode;
 	int draw_field_spell;
 	int separate_clear_button;
 
@@ -444,8 +443,6 @@ public:
 	irr::gui::IGUIButton* btnChainIgnore;
 	irr::gui::IGUIButton* btnChainAlways;
 	irr::gui::IGUIButton* btnChainWhenAvail;
-	//cancel or finish
-	irr::gui::IGUIButton* btnCancelOrFinish;
 };
 
 extern Game* mainGame;