Skip to content

Commit a4d64fe

Browse files
committed
Fix changes not applied in c5c69ff
1 parent eae2a10 commit a4d64fe

File tree

4 files changed

+1
-7
lines changed

4 files changed

+1
-7
lines changed

gframe/discord_wrapper.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ struct DiscordCallbacks {
205205
HIDE_AND_CHECK(game->wSinglePlay);
206206
HIDE_AND_CHECK(game->wDeckEdit);
207207
HIDE_AND_CHECK(game->wRules);
208-
HIDE_AND_CHECK(game->wCustomRules);
209208
HIDE_AND_CHECK(game->wRoomListPlaceholder);
210209
HIDE_AND_CHECK(game->wCardImg);
211210
HIDE_AND_CHECK(game->wInfos);

gframe/duelclient.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,6 @@ void DuelClient::HandleSTOCPacketLanAsync(const std::vector<uint8_t>& data) {
456456
#define HIDE_AND_CHECK(obj) if(obj->isVisible()) mainGame->HideElement(obj);
457457
HIDE_AND_CHECK(mainGame->wCreateHost);
458458
HIDE_AND_CHECK(mainGame->wRules);
459-
HIDE_AND_CHECK(mainGame->wCustomRules);
460459
#undef HIDE_AND_CHECK
461460
mainGame->ShowElement(mainGame->wRoomListPlaceholder);
462461
} else {
@@ -589,7 +588,6 @@ void DuelClient::HandleSTOCPacketLanAsync(const std::vector<uint8_t>& data) {
589588
#define HIDE_AND_CHECK(obj) if(obj->isVisible()) mainGame->HideElement(obj);
590589
HIDE_AND_CHECK(mainGame->wCreateHost);
591590
HIDE_AND_CHECK(mainGame->wRules);
592-
HIDE_AND_CHECK(mainGame->wCustomRules);
593591
#undef HIDE_AND_CHECK
594592
mainGame->ShowElement(mainGame->wRoomListPlaceholder);
595593
} else {

gframe/game.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -3481,7 +3481,6 @@ void Game::OnResize() {
34813481
wHostPrepareL->setRelativePosition(ResizeWin(70, 120, 270, 440));
34823482
}
34833483
wRules->setRelativePosition(ResizeWin(630, 100, 1000, 310));
3484-
SetCentered(wCustomRules);
34853484
wReplay->setRelativePosition(ResizeWin(220, 100, 800, 520));
34863485
wSinglePlay->setRelativePosition(ResizeWin(220, 100, 800, 520));
34873486
gBot.window->setRelativePosition(irr::core::position2di(wHostPrepare->getAbsolutePosition().LowerRightCorner.X, wHostPrepare->getAbsolutePosition().UpperLeftCorner.Y));

gframe/game.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ namespace irr {
3131
class CGUIFileSelectListBox;
3232
class CGUITTFont;
3333
class CGUIImageButton;
34+
class CGUIWindowedTabControl;
3435
class Panel;
3536
class IGUIComboBox;
3637
class IGUIContextMenu;
@@ -437,11 +438,8 @@ class Game {
437438
irr::gui::IGUICheckBox* chkRules[14];
438439
irr::gui::IGUIButton* btnRulesOK;
439440
irr::gui::IGUIComboBox* cbDuelRule;
440-
irr::gui::IGUIButton* btnCustomRule;
441441
irr::gui::IGUICheckBox* chkCustomRules[7+12+8+2];
442442
irr::gui::IGUICheckBox* chkTypeLimit[5];
443-
irr::gui::IGUIWindow* wCustomRules;
444-
irr::gui::IGUIButton* btnCustomRulesOK;
445443
irr::gui::IGUICheckBox* chkNoCheckDeck;
446444
irr::gui::IGUICheckBox* chkNoShuffleDeck;
447445
irr::gui::IGUICheckBox* chkTcgRulings;

0 commit comments

Comments
 (0)