Merge branch 'master' into server

gframe/game.cpp

@@ -18,8 +18,6 @@
 #include <regex>
 #endif //YGOPRO_SERVER_MODE
 
-#define KOISHI_VERNAME	"Hameln"
-
 unsigned short PRO_VERSION = 0x134A;
 
 namespace ygo {
@@ -155,7 +153,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X %s", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf, KOISHI_VERNAME);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Hameln", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
 	wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));

system.conf

@@ -2,7 +2,7 @@
 #nickname & gamename should be less than 20 characters
 use_d3d = 0
 use_image_scale = 1
-pro_version = 4937
+pro_version = 4938
 antialias = 2
 errorlog = 3
 nickname = Komeiji Koishi