Fix changes not applied in c5c69ff

edo9300 · Aug 29, 2022 · a4d64fe · a4d64fe
1 parent eae2a10
commit a4d64fe
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -456,7 +456,6 @@ void DuelClient::HandleSTOCPacketLanAsync(const std::vector<uint8_t>& data) {
 #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);
 #undef HIDE_AND_CHECK
 				mainGame->ShowElement(mainGame->wRoomListPlaceholder);
 			} else {
@@ -589,7 +588,6 @@ void DuelClient::HandleSTOCPacketLanAsync(const std::vector<uint8_t>& data) {
 #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);
 #undef HIDE_AND_CHECK
 					mainGame->ShowElement(mainGame->wRoomListPlaceholder);
 				} else {

diff --git 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
@@ -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;