revert port box

gframe/duelclient.cpp

@@ -4147,8 +4147,13 @@ bool DuelClient::LookupSRV(char *hostname, HostResult* result) {
 	return true;
 }
 
-HostResult DuelClient::ParseHost(char *hostname) {
+HostResult DuelClient::ParseHost(char *hostname, unsigned short port) {
 	HostResult result;
+	if(port) {
+		result.host = LookupHost(hostname);
+		result.port = port;
+		return result;
+	}
 	unsigned int tryAddress = htonl(inet_addr(hostname));
 	if(tryAddress != -1) {
 		result.host = tryAddress;

gframe/duelclient.h

@@ -92,7 +92,7 @@ public:
 	static void SendResponse();
 	static unsigned int LookupHost(char *host);
 	static bool LookupSRV(char *hostname, HostResult *result);
-	static HostResult ParseHost(char *hostname);
+	static HostResult ParseHost(char *hostname, unsigned short port);
 	static void SendPacketToServer(unsigned char proto) {
 		char* p = duel_client_write;
 		BufferIO::WriteInt16(p, 1);

gframe/game.cpp

@@ -177,8 +177,10 @@ bool Game::Initialize() {
 	lstHostList->setItemHeight(18);
 	btnLanRefresh = env->addButton(rect<s32>(240, 325, 340, 350), wLanWindow, BUTTON_LAN_REFRESH, dataManager.GetSysString(1217));
 	env->addStaticText(dataManager.GetSysString(1221), rect<s32>(10, 360, 220, 380), false, false, wLanWindow);
-	ebJoinHost = env->addEditBox(gameConf.lasthost, rect<s32>(110, 355, 420, 380), true, wLanWindow);
+	ebJoinHost = env->addEditBox(gameConf.lasthost, rect<s32>(110, 355, 350, 380), true, wLanWindow);
 	ebJoinHost->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
+	ebJoinPort = env->addEditBox(gameConf.lastport, rect<s32>(360, 355, 420, 380), true, wLanWindow);
+	ebJoinPort->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
 	env->addStaticText(dataManager.GetSysString(1222), rect<s32>(10, 390, 220, 410), false, false, wLanWindow);
 	ebJoinPass = env->addEditBox(gameConf.roompass, rect<s32>(110, 385, 420, 410), true, wLanWindow);
 	ebJoinPass->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
@@ -1290,6 +1292,7 @@ void Game::LoadConfig() {
 	gameConf.numfont[0] = 0;
 	gameConf.textfont[0] = 0;
 	gameConf.lasthost[0] = 0;
+	gameConf.lastport[0] = 0;
 	gameConf.roompass[0] = 0;
 	gameConf.bot_deck_path[0] = 0;
 	//settings
@@ -1351,11 +1354,8 @@ void Game::LoadConfig() {
 		} else if(!strcmp(strbuf, "lasthost")) {
 			BufferIO::DecodeUTF8(valbuf, wstr);
 			BufferIO::CopyWStr(wstr, gameConf.lasthost, 100);
-		} else if(!strcmp(strbuf, "lastport")) { // for config migration
-			BufferIO::DecodeUTF8(valbuf, wstr);
-			wchar_t tmpLastHost[100];
-			BufferIO::CopyWStr(gameConf.lasthost, tmpLastHost, 100);
-			myswprintf(gameConf.lasthost, L"%ls:%ls", tmpLastHost, wstr);
+		} else if(!strcmp(strbuf, "lastport")) {
+			gameConf.lastport = (unsigned short)atoi(valbuf);
 		} else if(!strcmp(strbuf, "roompass")) {
 			BufferIO::DecodeUTF8(valbuf, wstr);
 			BufferIO::CopyWStr(wstr, gameConf.roompass, 20);
@@ -1478,6 +1478,8 @@ void Game::SaveConfig() {
 	fprintf(fp, "serverport = %d\n", gameConf.serverport);
 	BufferIO::EncodeUTF8(gameConf.lasthost, linebuf);
 	fprintf(fp, "lasthost = %s\n", linebuf);
+	BufferIO::EncodeUTF8(gameConf.lastport, linebuf);
+	fprintf(fp, "lastport = %s\n", linebuf);
 	//settings
 	fprintf(fp, "automonsterpos = %d\n", (chkMAutoPos->isChecked() ? 1 : 0));
 	fprintf(fp, "autospellpos = %d\n", (chkSTAutoPos->isChecked() ? 1 : 0));

gframe/game.h

@@ -18,6 +18,7 @@ struct Config {
 	unsigned short serverport;
 	unsigned char textfontsize;
 	wchar_t lasthost[100];
+	unsigned short lastport;
 	wchar_t nickname[20];
 	wchar_t gamename[20];
 	wchar_t lastcategory[64];
@@ -326,6 +327,7 @@ public:
 	irr::gui::IGUIListBox* lstHostList;
 	irr::gui::IGUIButton* btnLanRefresh;
 	irr::gui::IGUIEditBox* ebJoinHost;
+	irr::gui::IGUIEditBox* ebJoinPort;
 	irr::gui::IGUIEditBox* ebJoinPass;
 	irr::gui::IGUIButton* btnJoinHost;
 	irr::gui::IGUIButton* btnJoinCancel;

gframe/gframe.cpp

@@ -76,6 +76,7 @@ int main(int argc, char* argv[]) {
 
 	bool keep_on_return = false;
 	bool deckCategorySpecified = false;
+	bool portSpecified = false;
 	for(int i = 1; i < wargc; ++i) {
 		if(wargv[i][0] == L'-' && wargv[i][1] == L'e' && wargv[i][2] != L'\0') {
 			ygo::dataManager.LoadDB(&wargv[i][2]);
@@ -94,17 +95,23 @@ int main(int argc, char* argv[]) {
 			continue;
 		} else if(!wcscmp(wargv[i], L"-h")) { // Host address
 			++i;
-			if(i < wargc)
+			if(i < wargc) {
 				ygo::mainGame->ebJoinHost->setText(wargv[i]);
+				if(!portSpecified)
+					ygo::mainGame->ebJoinPort->setText(L"");
+			}
 			continue;
-		} else if(!wcscmp(wargv[i], L"-p")) { // host port, deprecated, and should use 1.1.1.1:7911 instead
+		} else if(!wcscmp(wargv[i], L"-p")) { // host Port
 			++i;
 			if(i < wargc) {
-				auto host = ygo::mainGame->ebJoinHost->getText();
-				if(wcslen(host) > 0) {
-					wchar_t appended[100];
-					myswprintf(appended, L"%ls:%ls", host, wargv[i]);
-					ygo::mainGame->ebJoinHost->setText(appended);
+				portSpecified = true;
+				auto port = _wtoi(wargv[i]);
+				if(port) {
+					wchar_t portStr[6];
+					myswprintf(portStr, L"%d", port);
+					ygo::mainGame->ebJoinPort->setText(portStr);
+				} else {
+					ygo::mainGame->ebJoinPort->setText(L"");
 				}
 			}
 			continue;

gframe/menu_handler.cpp

@@ -68,7 +68,8 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				char hostname[100];
 				const wchar_t* pstr = mainGame->ebJoinHost->getText();
 				BufferIO::CopyWStr(pstr, hostname, 100);
-				HostResult remote = DuelClient::ParseHost(hostname);
+				auto port = (unsigned short)_wtoi(mainGame->ebJoinPort->getText());
+				HostResult remote = DuelClient::ParseHost(hostname, port);
 				if(!remote.isValid()) {
 					mainGame->gMutex.lock();
 					soundManager.PlaySoundEffect(SOUND_INFO);
@@ -77,6 +78,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					break;
 				}
 				BufferIO::CopyWStr(pstr, mainGame->gameConf.lasthost, 100);
+				mainGame->gameConf.lastport = port;
 				if(DuelClient::StartClient(remote.host, remote.port, false)) {
 					mainGame->btnCreateHost->setEnabled(false);
 					mainGame->btnJoinHost->setEnabled(false);
@@ -476,9 +478,11 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					break;
 				int addr = DuelClient::hosts[sel].ipaddr;
 				int port = DuelClient::hosts[sel].port;
-				wchar_t buf[26];
-				myswprintf(buf, L"%d.%d.%d.%d:%d", addr & 0xff, (addr >> 8) & 0xff, (addr >> 16) & 0xff, (addr >> 24) & 0xff, port);
+				wchar_t buf[20];
+				myswprintf(buf, L"%d.%d.%d.%d", addr & 0xff, (addr >> 8) & 0xff, (addr >> 16) & 0xff, (addr >> 24) & 0xff);
 				mainGame->ebJoinHost->setText(buf);
+				myswprintf(buf, L"%d", port);
+				mainGame->ebJoinPort->setText(buf);
 				break;
 			}
 			case LISTBOX_REPLAY_LIST: {

system.conf

-#config file
-#nickname & gamename should be less than 20 characters
-use_d3d = 0
-use_image_scale = 1
-antialias = 2
-errorlog = 3
-nickname = Player
-gamename = Game
-lastcategory = 未分类卡组
-lastdeck = new
-textfont = ./fonts/textFont.ttf 14
-numfont = ./fonts/numFont.ttf
-serverport = 7911
-lasthost = 127.0.0.1:7911
-automonsterpos = 0
-autospellpos = 0
-randompos = 0
-autochain = 0
-waitchain = 0
-showchain = 0
-mute_opponent = 0
-mute_spectators = 0
-use_lflist = 1
-default_lflist = 0
-default_rule = 0
-hide_setname = 0
-hide_hint_button = 0
-#control_mode = 0: Key A/S/D/R Chain Buttons. control_mode = 1: MouseLeft/MouseRight/NULL/F9 Without Chain Buttons
-control_mode = 0
-draw_field_spell = 1
-separate_clear_button = 1
-#auto_search_limit >= 0: Start search automatically when the user enters N chars
-auto_search_limit = -1
-#search_multiple_keywords = 0: Disable. 1: Search mutiple keywords with separator " ". 2: with separator "+"
-search_multiple_keywords = 1
-ignore_deck_changes = 0
-default_ot = 1
-enable_bot_mode = 0
-bot_deck_path = ./botdeck
-quick_animation = 0
-auto_save_replay = 0
-draw_single_chain = 0
-prefer_expansion_script = 0
-window_maximized = 0
-window_width = 1280
-window_height = 800
-resize_popup_menu = 0
-enable_sound = 1
-enable_music = 1
-#Volume of sound and music, between 0 and 100
-sound_volume = 50
-music_volume = 50
-music_mode = 1
+#config file
+#nickname & gamename should be less than 20 characters
+use_d3d = 0
+use_image_scale = 1
+antialias = 2
+errorlog = 3
+nickname = Player
+gamename = Game
+lastcategory = 未分类卡组
+lastdeck = new
+textfont = ./fonts/textFont.ttf 14
+numfont = ./fonts/numFont.ttf
+serverport = 7911
+lasthost = 127.0.0.1
+lastport = 7911
+automonsterpos = 0
+autospellpos = 0
+randompos = 0
+autochain = 0
+waitchain = 0
+showchain = 0
+mute_opponent = 0
+mute_spectators = 0
+use_lflist = 1
+default_lflist = 0
+default_rule = 0
+hide_setname = 0
+hide_hint_button = 0
+#control_mode = 0: Key A/S/D/R Chain Buttons. control_mode = 1: MouseLeft/MouseRight/NULL/F9 Without Chain Buttons
+control_mode = 0
+draw_field_spell = 1
+separate_clear_button = 1
+#auto_search_limit >= 0: Start search automatically when the user enters N chars
+auto_search_limit = -1
+#search_multiple_keywords = 0: Disable. 1: Search mutiple keywords with separator " ". 2: with separator "+"
+search_multiple_keywords = 1
+ignore_deck_changes = 0
+default_ot = 1
+enable_bot_mode = 0
+bot_deck_path = ./botdeck
+quick_animation = 0
+auto_save_replay = 0
+draw_single_chain = 0
+prefer_expansion_script = 0
+window_maximized = 0
+window_width = 1280
+window_height = 800
+resize_popup_menu = 0
+enable_sound = 1
+enable_music = 1
+#Volume of sound and music, between 0 and 100
+sound_volume = 50
+music_volume = 50
+music_mode = 1