info.duel_rule -> info.duel_flag

gframe/duelclient.cpp

@@ -127,7 +127,7 @@ void DuelClient::ClientEvent(bufferevent *bev, short events, void *ctx) {
 			cscg.info.draw_count = _wtoi(mainGame->ebDrawCount->getText());
 			cscg.info.time_limit = _wtoi(mainGame->ebTimeLimit->getText());
 			cscg.info.lflist = mainGame->cbLFlist->getItemData(mainGame->cbLFlist->getSelected());
-			cscg.info.duel_rule = mainGame->duel_param;
+			cscg.info.duel_flag = mainGame->duel_param;
 			cscg.info.no_check_deck = mainGame->chkNoCheckDeck->isChecked();
 			cscg.info.no_shuffle_deck = mainGame->chkNoShuffleDeck->isChecked();
 			cscg.info.sealed = mainGame->chkRules[0]->isChecked() ? 2 : 0;
@@ -379,32 +379,32 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		str.append(msgbuf);
 		uint32 rule = 5;
 		mainGame->dInfo.duel_rule = 2;
-		if(pkt->info.duel_rule == MASTER_RULE_1) {
+		if(pkt->info.duel_flag == MASTER_RULE_1) {
 			rule = 1;
 			mainGame->dInfo.duel_rule = 1;
 		}
-		else if(pkt->info.duel_rule == MASTER_RULE_2) {
+		else if(pkt->info.duel_flag == MASTER_RULE_2) {
 			rule = 2;
 			mainGame->dInfo.duel_rule = 2;
 		}
-		else if(pkt->info.duel_rule == MASTER_RULE_3) {
+		else if(pkt->info.duel_flag == MASTER_RULE_3) {
 			rule = 3;
 			mainGame->dInfo.duel_rule = 3;
 		}
-		else if(pkt->info.duel_rule == MASTER_RULE_4) {
+		else if(pkt->info.duel_flag == MASTER_RULE_4) {
 			rule = 4;
 			mainGame->dInfo.duel_rule = 4;
 		}
-		else if((pkt->info.duel_rule) & DUEL_EMZONE) {
+		else if((pkt->info.duel_flag) & DUEL_EMZONE) {
 			rule = 5;
 			mainGame->dInfo.duel_rule = 4;
 		}
-		else if((pkt->info.duel_rule) & DUEL_PZONE) {
+		else if((pkt->info.duel_flag) & DUEL_PZONE) {
 			rule = 5;
 			mainGame->dInfo.duel_rule = 3;
 		}
 		if(rule == 5) {
-			uint32 flag = pkt->info.duel_rule & 0xffff, filter = 0x100;
+			uint32 flag = pkt->info.duel_flag & 0xffff, filter = 0x100;
 			for (int i = 0; i < 5; ++i, filter <<= 1)
 				if (flag & filter) {
 					myswprintf(msgbuf, L"*%ls\n", dataManager.GetSysString(1265 + i));
@@ -3880,12 +3880,24 @@ void DuelClient::BroadcastReply(evutil_socket_t fd, short events, void * arg) {
 			myswprintf(msgbuf, L"%X.0%X.%X", pHP->version >> 12, (pHP->version >> 4) & 0xff, pHP->version & 0xf);
 			hoststr.append(msgbuf);
 			hoststr.append(L"][");
-			myswprintf(msgbuf, L"MR %d", (pHP->host.duel_rule == 0) ? 3 : pHP->host.duel_rule);
+			int rule = 5;
+			if (pHP->host.duel_flag == MASTER_RULE_1)
+				rule = 1;
+			else if (pHP->host.duel_flag == MASTER_RULE_2)
+				rule = 2;
+			else if (pHP->host.duel_flag == MASTER_RULE_3)
+				rule = 3;
+			else if (pHP->host.duel_flag == MASTER_RULE_4)
+				rule = 4;
+			if (rule == 5)
+				myswprintf(msgbuf, L"Custom MR");
+			else
+				myswprintf(msgbuf, L"MR %d", (rule == 0) ? 3 : rule);
 			hoststr.append(msgbuf);
 			hoststr.append(L"][");
 			if(pHP->host.draw_count == 1 && pHP->host.start_hand == 5 && pHP->host.start_lp == 8000
 			        && !pHP->host.no_check_deck && !pHP->host.no_shuffle_deck 
-					&& pHP->host.duel_rule == DEFAULT_DUEL_RULE && !pHP->host.destiny_draw 
+					&& rule == DEFAULT_DUEL_RULE && !pHP->host.destiny_draw
 					&& pHP->host.rule_count==0)
 				hoststr.append(dataManager.GetSysString(1280));
 			else hoststr.append(dataManager.GetSysString(1281));

gframe/network.h

@@ -15,7 +15,7 @@ struct HostInfo {
 	unsigned int lflist;
 	unsigned char rule;
 	unsigned char mode;
-	unsigned int duel_rule;
+	unsigned int duel_flag;
 	bool no_check_deck;
 	bool no_shuffle_deck;
 	unsigned int start_lp;

gframe/single_duel.cpp

@@ -413,7 +413,7 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 	pduel = create_duel(rnd.rand());
 	set_player_info(pduel, 0, host_info.start_lp, host_info.start_hand, host_info.draw_count);
 	set_player_info(pduel, 1, host_info.start_lp, host_info.start_hand, host_info.draw_count);
-	int opt = host_info.duel_rule;
+	int opt = host_info.duel_flag;
 	if(host_info.no_shuffle_deck)
 		opt |= DUEL_PSEUDO_SHUFFLE;
 	if(host_info.speed)

gframe/tag_duel.cpp

@@ -382,7 +382,7 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 	pduel = create_duel(rnd.rand());
 	set_player_info(pduel, 0, host_info.start_lp, host_info.start_hand, host_info.draw_count);
 	set_player_info(pduel, 1, host_info.start_lp, host_info.start_hand, host_info.draw_count);
-	int opt = host_info.duel_rule;
+	int opt = host_info.duel_flag;
 	if(host_info.no_shuffle_deck)
 		opt |= DUEL_PSEUDO_SHUFFLE;
 	if(host_info.speed)