From da29766487f213be64aa82c2d1e3b02f2a102f7a Mon Sep 17 00:00:00 2001
From: Edoardo Lolletti <edoardo762@gmail.com>
Date: Mon, 29 Aug 2022 17:30:43 +0200
Subject: [PATCH] Fix changes not applied in
 c5c69ff61e5dca28739de80913671dec1667aced

---
 gframe/discord_wrapper.cpp | 1 -
 gframe/duelclient.cpp      | 4 +---
 gframe/game.cpp            | 1 -
 gframe/game.h              | 4 +---
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/gframe/discord_wrapper.cpp b/gframe/discord_wrapper.cpp
index 706ae0ca5..65807c7b5 100644
--- a/gframe/discord_wrapper.cpp
+++ b/gframe/discord_wrapper.cpp
@@ -205,7 +205,6 @@ struct DiscordCallbacks {
 			HIDE_AND_CHECK(game->wSinglePlay);
 			HIDE_AND_CHECK(game->wDeckEdit);
 			HIDE_AND_CHECK(game->wRules);
-			HIDE_AND_CHECK(game->wCustomRules);
 			HIDE_AND_CHECK(game->wRoomListPlaceholder);
 			HIDE_AND_CHECK(game->wCardImg);
 			HIDE_AND_CHECK(game->wInfos);
diff --git a/gframe/duelclient.cpp b/gframe/duelclient.cpp
index 17004855b..f31d2a1f1 100644
--- a/gframe/duelclient.cpp
+++ b/gframe/duelclient.cpp
@@ -455,8 +455,7 @@ void DuelClient::HandleSTOCPacketLanAsync(const std::vector<uint8_t>& data) {
 			if(mainGame->isHostingOnline) {
 #define HIDE_AND_CHECK(obj) if(obj->isVisible()) mainGame->HideElement(obj);
 				HIDE_AND_CHECK(mainGame->wCreateHost);
-				HIDE_AND_CHECK(mainGame->wRules);
-				HIDE_AND_CHECK(mainGame->wCustomRules);
+				HIDE_AND_CHECK(mainGame->wRules
 #undef HIDE_AND_CHECK
 				mainGame->ShowElement(mainGame->wRoomListPlaceholder);
 			} else {
@@ -591,7 +590,6 @@ void DuelClient::HandleSTOCPacketLanAsync(const std::vector<uint8_t>& data) {
 					HIDE_AND_CHECK(mainGame->wRules);
 					HIDE_AND_CHECK(mainGame->wCustomRules);
 #undef HIDE_AND_CHECK
-					mainGame->ShowElement(mainGame->wRoomListPlaceholder);
 				} else {
 					mainGame->btnCreateHost->setEnabled(mainGame->coreloaded);
 				}
diff --git a/gframe/game.cpp b/gframe/game.cpp
index 197575739..9632f180a 100644
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -3481,7 +3481,6 @@ void Game::OnResize() {
 		wHostPrepareL->setRelativePosition(ResizeWin(70, 120, 270, 440));
 	}
 	wRules->setRelativePosition(ResizeWin(630, 100, 1000, 310));
-	SetCentered(wCustomRules);
 	wReplay->setRelativePosition(ResizeWin(220, 100, 800, 520));
 	wSinglePlay->setRelativePosition(ResizeWin(220, 100, 800, 520));
 	gBot.window->setRelativePosition(irr::core::position2di(wHostPrepare->getAbsolutePosition().LowerRightCorner.X, wHostPrepare->getAbsolutePosition().UpperLeftCorner.Y));
diff --git a/gframe/game.h b/gframe/game.h
index 47df23c67..87130e7e8 100644
--- a/gframe/game.h
+++ b/gframe/game.h
@@ -31,6 +31,7 @@ namespace irr {
 		class CGUIFileSelectListBox;
 		class CGUITTFont;
 		class CGUIImageButton;
+		class CGUIWindowedTabControl;
 		class Panel;
 		class IGUIComboBox;
 		class IGUIContextMenu;
@@ -437,11 +438,8 @@ class Game {
 	irr::gui::IGUICheckBox* chkRules[14];
 	irr::gui::IGUIButton* btnRulesOK;
 	irr::gui::IGUIComboBox* cbDuelRule;
-	irr::gui::IGUIButton* btnCustomRule;
 	irr::gui::IGUICheckBox* chkCustomRules[7+12+8+2];
 	irr::gui::IGUICheckBox* chkTypeLimit[5];
-	irr::gui::IGUIWindow* wCustomRules;
-	irr::gui::IGUIButton* btnCustomRulesOK;
 	irr::gui::IGUICheckBox* chkNoCheckDeck;
 	irr::gui::IGUICheckBox* chkNoShuffleDeck;
 	irr::gui::IGUICheckBox* chkTcgRulings;