Updated button displaying

https://github.com/Fluorohydride/ygopro/pull/1996

gframe/duelclient.cpp

@@ -568,6 +568,18 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->wChat->setVisible(true);
 		mainGame->imgCard->setImage(imageManager.tCover[0]);
 		mainGame->device->setEventReceiver(&mainGame->dField);
+		// reset master rule 4 phase button position
+		if (mainGame->dInfo.duel_rule >= 4) {
+			mainGame->btnSP->setRelativePosition(mainGame->Resize(0, 0, 50, 20));
+			mainGame->btnM1->setRelativePosition(mainGame->Resize(160, 0, 210, 20));
+			mainGame->btnBP->setRelativePosition(mainGame->Resize(160, 0, 210, 20));
+			mainGame->btnM2->setRelativePosition(mainGame->Resize(160, 0, 210, 20));
+		} else {
+			mainGame->btnSP->setRelativePosition(mainGame->Resize(65, 0, 115, 20));
+			mainGame->btnM1->setRelativePosition(mainGame->Resize(130, 0, 180, 20));
+			mainGame->btnBP->setRelativePosition(mainGame->Resize(195, 0, 245, 20));
+			mainGame->btnM2->setRelativePosition(mainGame->Resize(260, 0, 310, 20));
+		}
 		if(!mainGame->dInfo.isTag) {
 			if(selftype > 1) {
 				mainGame->dInfo.player_type = 7;

gframe/game.cpp

@@ -241,13 +241,13 @@ bool Game::Initialize() {
 	btnSP->setEnabled(false);
 	btnSP->setPressed(true);
 	btnSP->setVisible(false);
-	btnM1 = env->addButton(rect<s32>(130, 0, 180, 20), wPhase, -1, L"\xff2d\xff11");
+	btnM1 = env->addButton(rect<s32>(160, 0, 210, 20), wPhase, -1, L"\xff2d\xff11");
 	btnM1->setEnabled(false);
 	btnM1->setPressed(true);
 	btnM1->setVisible(false);
 	btnBP = env->addButton(rect<s32>(160, 0, 210, 20), wPhase, BUTTON_BP, L"\xff22\xff30");
 	btnBP->setVisible(false);
-	btnM2 = env->addButton(rect<s32>(160, 0, 210, 20), wPhase, BUTTON_M2, L"\xff2d\xff12");
+	btnM2 = env->addButton(rect<s32>(260, 0, 310, 20), wPhase, BUTTON_M2, L"\xff2d\xff12");
 	btnM2->setVisible(false);
 	btnEP = env->addButton(rect<s32>(320, 0, 370, 20), wPhase, BUTTON_EP, L"\xff25\xff30");
 	btnEP->setVisible(false);
@@ -1471,10 +1471,17 @@ void Game::OnResize()
 
 	wPhase->setRelativePosition(Resize(480, 310, 855, 330));
 	btnDP->setRelativePosition(Resize(0, 0, 50, 20));
+	if (dInfo.duel_rule >= 4) {
 		btnSP->setRelativePosition(Resize(0, 0, 50, 20));
 		btnM1->setRelativePosition(Resize(160, 0, 210, 20));
 		btnBP->setRelativePosition(Resize(160, 0, 210, 20));
 		btnM2->setRelativePosition(Resize(160, 0, 210, 20));
+	} else {
+		btnSP->setRelativePosition(Resize(65, 0, 115, 20));
+		btnM1->setRelativePosition(Resize(130, 0, 180, 20));
+		btnBP->setRelativePosition(Resize(195, 0, 245, 20));
+		btnM2->setRelativePosition(Resize(260, 0, 310, 20));
+	}
 	btnEP->setRelativePosition(Resize(320, 0, 370, 20));
 	btnShuffle->setRelativePosition(Resize(0, 0, 50, 20));
 	btnSpectatorSwap->setRelativePosition(Resize(205, 100, 295, 135));

gframe/replay_mode.cpp

@@ -89,6 +89,18 @@ int ReplayMode::ReplayThread(void* param) {
 	myswprintf(mainGame->dInfo.strLP[0], L"%d", mainGame->dInfo.lp[0]);
 	myswprintf(mainGame->dInfo.strLP[1], L"%d", mainGame->dInfo.lp[1]);
 	mainGame->dInfo.turn = 0;
+	// reset master rule 4 phase button position
+	if (mainGame->dInfo.duel_rule >= 4) {
+		mainGame->btnSP->setRelativePosition(mainGame->Resize(0, 0, 50, 20));
+		mainGame->btnM1->setRelativePosition(mainGame->Resize(160, 0, 210, 20));
+		mainGame->btnBP->setRelativePosition(mainGame->Resize(160, 0, 210, 20));
+		mainGame->btnM2->setRelativePosition(mainGame->Resize(160, 0, 210, 20));
+	} else {
+		mainGame->btnSP->setRelativePosition(mainGame->Resize(65, 0, 115, 20));
+		mainGame->btnM1->setRelativePosition(mainGame->Resize(130, 0, 180, 20));
+		mainGame->btnBP->setRelativePosition(mainGame->Resize(195, 0, 245, 20));
+		mainGame->btnM2->setRelativePosition(mainGame->Resize(260, 0, 310, 20));
+	}
 	if(!(opt & DUEL_TAG_MODE)) {
 		int main = cur_replay.ReadInt32();
 		for(int i = 0; i < main; ++i)

gframe/single_mode.cpp

@@ -665,6 +665,18 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) {
 			mainGame->gMutex.Lock();
 			mainGame->dField.Clear();
 			mainGame->dInfo.duel_rule = BufferIO::ReadInt8(pbuf);
+			// reset master rule 4 phase button position
+			if (mainGame->dInfo.duel_rule >= 4) {
+				mainGame->btnSP->setRelativePosition(mainGame->Resize(0, 0, 50, 20));
+				mainGame->btnM1->setRelativePosition(mainGame->Resize(160, 0, 210, 20));
+				mainGame->btnBP->setRelativePosition(mainGame->Resize(160, 0, 210, 20));
+				mainGame->btnM2->setRelativePosition(mainGame->Resize(160, 0, 210, 20));
+			} else {
+				mainGame->btnSP->setRelativePosition(mainGame->Resize(65, 0, 115, 20));
+				mainGame->btnM1->setRelativePosition(mainGame->Resize(130, 0, 180, 20));
+				mainGame->btnBP->setRelativePosition(mainGame->Resize(195, 0, 245, 20));
+				mainGame->btnM2->setRelativePosition(mainGame->Resize(260, 0, 310, 20));
+			}
 			int val = 0;
 			for(int p = 0; p < 2; ++p) {
 				mainGame->dInfo.lp[p] = BufferIO::ReadInt32(pbuf);