Skip to content

Y
ygopro
Commit cac6f09b authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents 714d2bd0 fb1a1fdb
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
cards.cdb
View file @ cac6f09b
No preview for this file type
gframe/game.cpp
View file @ cac6f09b
...@@ -153,7 +153,7 @@ bool Game::Initialize() { ...@@ -153,7 +153,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 Mermaid", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf); myswprintf(strbuf, L"KoishiPro %X.0%X.%X Saigetsu", 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));
......
ocgcore @ a140d5d2
Subproject commit cfbe5a15215c7168d962f540ed63d02d5ab804e1 Subproject commit a140d5d29c7e9da840f51cc21437f3a7227aa7f3
script @ 766c38f7
Subproject commit a5a534da7c7fed9fe8bc67e7f533be7eb2db5ded Subproject commit 766c38f7a4fc239838216f98c2b611fcff4ae036
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