Merge branch 'develop' into server-develop

gframe/game.cpp

@@ -311,13 +311,8 @@ bool Game::Initialize() {
 	env->addStaticText(dataManager.GetSysString(1221), rect<s32>(10, 360, 220, 380), false, false, wLanWindow);
 	ebJoinHost = env->addEditBox(gameConf.lasthost, rect<s32>(110, 355, 350, 380), true, wLanWindow);
 	ebJoinHost->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
-	wchar_t lastPortText[6];
-	if(gameConf.lastport)
-		myswprintf(lastPortText, L"%d", gameConf.lastport);
-	else
-		myswprintf(lastPortText, L"");
 	editbox_list.push_back(ebJoinHost);
-	ebJoinPort = env->addEditBox(lastPortText, rect<s32>(360, 355, 420, 380), true, wLanWindow);
+	ebJoinPort = env->addEditBox(gameConf.lastport, rect<s32>(360, 355, 420, 380), true, wLanWindow);
 	ebJoinPort->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
 	editbox_list.push_back(ebJoinPort);
 	env->addStaticText(dataManager.GetSysString(1222), rect<s32>(10, 390, 220, 410), false, false, wLanWindow);

gframe/menu_handler.cpp

@@ -86,6 +86,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				}
 				BufferIO::CopyWideString(pstr, mainGame->gameConf.lasthost);
 				BufferIO::CopyWideString(portstr, mainGame->gameConf.lastport);
+				BufferIO::CopyWideString(mainGame->ebJoinPass->getText(), mainGame->gameConf.roompass);
 				if(DuelClient::StartClient(remote.host, remote.port, false)) {
 					mainGame->btnCreateHost->setEnabled(false);
 					mainGame->btnJoinHost->setEnabled(false);

ocgcore @ 1df6818e

-Subproject commit 768b0323c5d01782c8922f4301df2c86d0b0a7fb
+Subproject commit 1df6818ead44e0d01765c60a1ff93fbb10ad9037

script @ 8af8a510

-Subproject commit 0e970000f2b3198d8d11735ee50f74d57fa603a0
+Subproject commit 8af8a510cc48c17c1e147451caa5ba76f750c784

system.conf

@@ -14,6 +14,7 @@ numfont = ./fonts/arial.ttf
 serverport = 7911
 lasthost = 127.0.0.1
 lastport = 0
+roompass = 
 automonsterpos = 0
 autospellpos = 0
 randompos = 0