Skip to content

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

Merge branch 'master' into server

parents dba6c3d9 2e7cbcf2
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
cards.cdb
View file @ 03404fa1
No preview for this file type
gframe/game.cpp
View file @ 03404fa1
...@@ -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 IZANA", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf); myswprintf(strbuf, L"KoishiPro %X.0%X.%X Replica", 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 @ 1b8b6c51
Subproject commit ecb46ac521d53ecec3d4182b76bddc1bc67c90d1 Subproject commit 1b8b6c51acd68bf9a441f666316c787df0f6d967
script @ 0895099e
Subproject commit df1137c1d9ca27697cc9be63da50191df629a158 Subproject commit 0895099e40fef293c6f7653836c5cdf7a36b9e61
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