Commit 9b97e9f1 authored by nanahira's avatar nanahira

Merge branch 'master' into server

parents d0c25cce 0e0ddc96
...@@ -150,7 +150,7 @@ bool Game::Initialize() { ...@@ -150,7 +150,7 @@ bool Game::Initialize() {
SetWindowsIcon(); SetWindowsIcon();
//main menu //main menu
wchar_t strbuf[256]; wchar_t strbuf[256];
myswprintf(strbuf, L"KoishiPro %X.0%X.%X Mopemope", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf); myswprintf(strbuf, L"KoishiPro %X.0%X.%X Latitude", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf); wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
wMainMenu->getCloseButton()->setVisible(false); wMainMenu->getCloseButton()->setVisible(false);
btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200)); btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));
......
Subproject commit 0585a44f2f9e8dc1028423fbdd1f066e7e8db44a Subproject commit 8fcf28ce5eaeda7b19205e439f7a1986aafc5b76
Subproject commit 856c2ecbc1dbdd60e2d9452d902283d73c27aa09 Subproject commit d9c80c813f23b8f8758cca8f71661fa31888809f
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment