Skip to content

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

Merge branch 'master' into server

parents b8d819dc 9bd939e5
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
cards.cdb
View file @ ecb73e5e
No preview for this file type
gframe/game.cpp
View file @ ecb73e5e
...@@ -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 Cinderella", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf); myswprintf(strbuf, L"KoishiPro %X.0%X.%X Cherish", 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 @ 263477ac
Subproject commit f71801c66b3ebd3cb1247a8f9b74b65334fd8d0b Subproject commit 263477ac07cc4b2c553a0cec92ed69049b012ead
script @ d2b54db1
Subproject commit e6f03739e60d3f93caaa09fd0bbc1f0c4dc617ad Subproject commit d2b54db1e85825ce3344a777ae0b35e4c728eb79
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