Skip to content

Y
YGOMobile
Commit 0e9e4442 authored by fallenstardust's avatar fallenstardust
Browse files
Options

Merge branch 'master' of https://github.com/fallenstardust/YGOMobile-cn-ko-en

parents 0e914384 abe0cd7e
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 48 deletions
Classes/gframe/drawing.cpp
View file @ 0e9e4442
...@@ -1111,7 +1111,7 @@ void Game::ShowElement(irr::gui::IGUIElement * win, int autoframe) { ...@@ -1111,7 +1111,7 @@ void Game::ShowElement(irr::gui::IGUIElement * win, int autoframe) {
FadingUnit fu; FadingUnit fu;
fu.fadingSize = win->getRelativePosition(); fu.fadingSize = win->getRelativePosition();
for(auto fit = fadingList.begin(); fit != fadingList.end(); ++fit) for(auto fit = fadingList.begin(); fit != fadingList.end(); ++fit)
if(win == fit->guiFading && win != wOptions && win != wANNumber) // the size of wOptions is always setted by ClientField::ShowSelectOption before showing it if(win == fit->guiFading && win != wOptions && win != wANNumber && win != wPosSelect) // the size of those windows are always setted before showing them
fu.fadingSize = fit->fadingSize; fu.fadingSize = fit->fadingSize;
irr::core::position2di center = fu.fadingSize.getCenter(); irr::core::position2di center = fu.fadingSize.getCenter();
fu.fadingDiff.X = fu.fadingSize.getWidth() / 10; fu.fadingDiff.X = fu.fadingSize.getWidth() / 10;
......
Classes/gframe/duelclient.cpp
View file @ 0e9e4442
...@@ -1824,14 +1824,11 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1824,14 +1824,11 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
SetResponseI(positions); SetResponseI(positions);
return true; return true;
} }
int count = 0, filter = 0x1, startpos; int count = 0, filter = 0x1, startpos = 30;
while(filter != 0x10) { while(filter != 0x10) {
if(positions & filter) count++; if(positions & filter) count++;
filter <<= 1; filter <<= 1;
} }
if(count == 4) startpos = 10;
else if(count == 3) startpos = 82;
else startpos = 50;
if(positions & 0x1) { if(positions & 0x1) {
mainGame->imageLoading.insert(std::make_pair(mainGame->btnPSAU, code)); mainGame->imageLoading.insert(std::make_pair(mainGame->btnPSAU, code));
mainGame->btnPSAU->setRelativePosition(rect<s32>(startpos * mainGame->xScale, 20 * mainGame->yScale, (startpos + 140) * mainGame->xScale, 160 * mainGame->yScale)); mainGame->btnPSAU->setRelativePosition(rect<s32>(startpos * mainGame->xScale, 20 * mainGame->yScale, (startpos + 140) * mainGame->xScale, 160 * mainGame->yScale));
...@@ -1854,6 +1851,14 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1854,6 +1851,14 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame->btnPSDD->setVisible(true); mainGame->btnPSDD->setVisible(true);
startpos += 150; startpos += 150;
} else mainGame->btnPSDD->setVisible(false); } else mainGame->btnPSDD->setVisible(false);
recti pos = mainGame->wPosSelect->getRelativePosition();
s32 oldcenter = pos.getCenter().X;
pos.LowerRightCorner.X = pos.UpperLeftCorner.X + count * 150 * mainGame->xScale + 50 * mainGame->xScale;
s32 newwidth = pos.getWidth();
pos.UpperLeftCorner.X = oldcenter - newwidth / 2;
pos.LowerRightCorner.X = oldcenter + newwidth / 2;
mainGame->wPosSelect->setRelativePosition(pos);
mainGame->bgPosSelect->setRelativePosition(rect<s32>(0, 0, pos.getWidth(), pos.getHeight()));
mainGame->gMutex.lock(); mainGame->gMutex.lock();
mainGame->PopupElement(mainGame->wPosSelect); mainGame->PopupElement(mainGame->wPosSelect);
mainGame->gMutex.unlock(); mainGame->gMutex.unlock();
......
Classes/gframe/game.cpp
View file @ 0e9e4442
...@@ -303,7 +303,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -303,7 +303,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wLanWindow = env->addWindow(rect<s32>(220 * xScale, 100 * yScale, 800 * xScale, 520 * yScale), false, dataManager.GetSysString(1200)); wLanWindow = env->addWindow(rect<s32>(220 * xScale, 100 * yScale, 800 * xScale, 520 * yScale), false, dataManager.GetSysString(1200));
wLanWindow->getCloseButton()->setVisible(false); wLanWindow->getCloseButton()->setVisible(false);
wLanWindow->setVisible(false); wLanWindow->setVisible(false);
ChangeToIGUIImageWindow(wLanWindow, bgLanWindow, imageManager.tWindow); ChangeToIGUIImageWindow(wLanWindow, &bgLanWindow, imageManager.tWindow);
env->addStaticText(dataManager.GetSysString(1220), rect<s32>(30 * xScale, 30 * yScale, 70 * xScale, 70 * yScale), false, false, wLanWindow); env->addStaticText(dataManager.GetSysString(1220), rect<s32>(30 * xScale, 30 * yScale, 70 * xScale, 70 * yScale), false, false, wLanWindow);
ebNickName = CAndroidGUIEditBox::addAndroidEditBox(gameConf.nickname, true, env, rect<s32>(110 * xScale, 25 * yScale, 420 * xScale, 65 * yScale), wLanWindow); ebNickName = CAndroidGUIEditBox::addAndroidEditBox(gameConf.nickname, true, env, rect<s32>(110 * xScale, 25 * yScale, 420 * xScale, 65 * yScale), wLanWindow);
ebNickName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER); ebNickName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
...@@ -331,7 +331,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -331,7 +331,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wCreateHost = env->addWindow(rect<s32>(220 * xScale, 100 * yScale, 800 * xScale, 520 * yScale), false, dataManager.GetSysString(1224)); wCreateHost = env->addWindow(rect<s32>(220 * xScale, 100 * yScale, 800 * xScale, 520 * yScale), false, dataManager.GetSysString(1224));
wCreateHost->getCloseButton()->setVisible(false); wCreateHost->getCloseButton()->setVisible(false);
wCreateHost->setVisible(false); wCreateHost->setVisible(false);
ChangeToIGUIImageWindow(wCreateHost, bgCreateHost, imageManager.tWindow); ChangeToIGUIImageWindow(wCreateHost, &bgCreateHost, imageManager.tWindow);
env->addStaticText(dataManager.GetSysString(1226), rect<s32>(20 * xScale, 30 * yScale, 90 * xScale, 65 * yScale), false, false, wCreateHost); env->addStaticText(dataManager.GetSysString(1226), rect<s32>(20 * xScale, 30 * yScale, 90 * xScale, 65 * yScale), false, false, wCreateHost);
cbHostLFlist = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(110 * xScale, 25 * yScale, 260 * xScale, 65 * yScale), wCreateHost); cbHostLFlist = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(110 * xScale, 25 * yScale, 260 * xScale, 65 * yScale), wCreateHost);
for(unsigned int i = 0; i < deckManager._lfList.size(); ++i) for(unsigned int i = 0; i < deckManager._lfList.size(); ++i)
...@@ -411,7 +411,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -411,7 +411,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wHostPrepare->setDraggable(false); wHostPrepare->setDraggable(false);
wHostPrepare->getCloseButton()->setVisible(false); wHostPrepare->getCloseButton()->setVisible(false);
wHostPrepare->setVisible(false); wHostPrepare->setVisible(false);
ChangeToIGUIImageWindow(wHostPrepare, bgHostPrepare, imageManager.tWindow); ChangeToIGUIImageWindow(wHostPrepare, &bgHostPrepare, imageManager.tWindow);
btnHostPrepDuelist = env->addButton(rect<s32>(10 * xScale, 30 * yScale, 120 * xScale, 70 * yScale), wHostPrepare, BUTTON_HP_DUELIST, dataManager.GetSysString(1251)); btnHostPrepDuelist = env->addButton(rect<s32>(10 * xScale, 30 * yScale, 120 * xScale, 70 * yScale), wHostPrepare, BUTTON_HP_DUELIST, dataManager.GetSysString(1251));
ChangeToIGUIImageButton(btnHostPrepDuelist, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnHostPrepDuelist, imageManager.tButton_S, imageManager.tButton_S_pressed);
for(int i = 0; i < 2; ++i) { for(int i = 0; i < 2; ++i) {
...@@ -485,7 +485,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -485,7 +485,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wInfos->getCloseButton()->setVisible(false); wInfos->getCloseButton()->setVisible(false);
wInfos->setDraggable(false); wInfos->setDraggable(false);
wInfos->setVisible(false); wInfos->setVisible(false);
ChangeToIGUIImageWindow(wInfos, bgInfos, imageManager.tWindow_V); ChangeToIGUIImageWindow(wInfos, &bgInfos, imageManager.tWindow_V);
//info //info
stName = env->addStaticText(L"", rect<s32>(10 * xScale, 10 * yScale, 250 * xScale, 32 * yScale), true, false, wInfos, -1, false); stName = env->addStaticText(L"", rect<s32>(10 * xScale, 10 * yScale, 250 * xScale, 32 * yScale), true, false, wInfos, -1, false);
stName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER); stName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
...@@ -517,7 +517,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -517,7 +517,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wLogs = env->addWindow(rect<s32>(720 * xScale, 1 * yScale, 1020 * xScale, 501 * yScale), false, dataManager.GetSysString(1271)); wLogs = env->addWindow(rect<s32>(720 * xScale, 1 * yScale, 1020 * xScale, 501 * yScale), false, dataManager.GetSysString(1271));
wLogs->getCloseButton()->setVisible(false); wLogs->getCloseButton()->setVisible(false);
wLogs->setVisible(false); wLogs->setVisible(false);
ChangeToIGUIImageWindow(wLogs, bgLogs, imageManager.tDialog_S); ChangeToIGUIImageWindow(wLogs, &bgLogs, imageManager.tDialog_S);
lstLog = env->addListBox(rect<s32>(10 * xScale, 20 * yScale, 290 * xScale, 440 * yScale), wLogs, LISTBOX_LOG, false); lstLog = env->addListBox(rect<s32>(10 * xScale, 20 * yScale, 290 * xScale, 440 * yScale), wLogs, LISTBOX_LOG, false);
lstLog->setItemHeight(30 * yScale); lstLog->setItemHeight(30 * yScale);
btnClearLog = env->addButton(rect<s32>(20 * xScale, 450 * yScale, 130 * xScale, 490 * yScale), wLogs, BUTTON_CLEAR_LOG, dataManager.GetSysString(1304)); btnClearLog = env->addButton(rect<s32>(20 * xScale, 450 * yScale, 130 * xScale, 490 * yScale), wLogs, BUTTON_CLEAR_LOG, dataManager.GetSysString(1304));
...@@ -541,7 +541,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -541,7 +541,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wSettings->setRelativePosition(recti(220 * xScale, 100 * yScale, 800 * xScale, 520 * yScale)); wSettings->setRelativePosition(recti(220 * xScale, 100 * yScale, 800 * xScale, 520 * yScale));
wSettings->getCloseButton()->setVisible(false); wSettings->getCloseButton()->setVisible(false);
wSettings->setVisible(false); wSettings->setVisible(false);
ChangeToIGUIImageWindow(wSettings, bgSettings, imageManager.tWindow); ChangeToIGUIImageWindow(wSettings, &bgSettings, imageManager.tWindow);
int posX = 20 * xScale; int posX = 20 * xScale;
int posY = 40 * yScale; int posY = 40 * yScale;
chkMAutoPos = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), wSettings, -1, dataManager.GetSysString(1274)); chkMAutoPos = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), wSettings, -1, dataManager.GetSysString(1274));
...@@ -634,7 +634,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -634,7 +634,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wFTSelect = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, L""); wFTSelect = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, L"");
wFTSelect->getCloseButton()->setVisible(false); wFTSelect->getCloseButton()->setVisible(false);
wFTSelect->setVisible(false); wFTSelect->setVisible(false);
ChangeToIGUIImageWindow(wFTSelect, bgFTSelect, imageManager.tDialog_L); ChangeToIGUIImageWindow(wFTSelect, &bgFTSelect, imageManager.tDialog_L);
btnFirst = env->addButton(rect<s32>(20 * xScale, 35 * yScale, 370 * xScale, 85 * yScale), wFTSelect, BUTTON_FIRST, dataManager.GetSysString(100)); btnFirst = env->addButton(rect<s32>(20 * xScale, 35 * yScale, 370 * xScale, 85 * yScale), wFTSelect, BUTTON_FIRST, dataManager.GetSysString(100));
ChangeToIGUIImageButton(btnFirst, imageManager.tButton_L, imageManager.tButton_L_pressed, titleFont); ChangeToIGUIImageButton(btnFirst, imageManager.tButton_L, imageManager.tButton_L_pressed, titleFont);
btnSecond = env->addButton(rect<s32>(20 * xScale, 95 * yScale, 370 * xScale, 145 * yScale), wFTSelect, BUTTON_SECOND, dataManager.GetSysString(101)); btnSecond = env->addButton(rect<s32>(20 * xScale, 95 * yScale, 370 * xScale, 145 * yScale), wFTSelect, BUTTON_SECOND, dataManager.GetSysString(101));
...@@ -643,7 +643,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -643,7 +643,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wMessage = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(1216)); wMessage = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(1216));
wMessage->getCloseButton()->setVisible(false); wMessage->getCloseButton()->setVisible(false);
wMessage->setVisible(false); wMessage->setVisible(false);
ChangeToIGUIImageWindow(wMessage, bgMessage, imageManager.tDialog_L); ChangeToIGUIImageWindow(wMessage, &bgMessage, imageManager.tDialog_L);
stMessage = env->addStaticText(L"", rect<s32>(20 * xScale, 20 * yScale, 370 * xScale, 100 * yScale), false, true, wMessage, -1, false); stMessage = env->addStaticText(L"", rect<s32>(20 * xScale, 20 * yScale, 370 * xScale, 100 * yScale), false, true, wMessage, -1, false);
stMessage->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER); stMessage->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER);
btnMsgOK = env->addButton(rect<s32>(130 * xScale, 120 * yScale, 260 * xScale, 170 * yScale), wMessage, BUTTON_MSG_OK, dataManager.GetSysString(1211)); btnMsgOK = env->addButton(rect<s32>(130 * xScale, 120 * yScale, 260 * xScale, 170 * yScale), wMessage, BUTTON_MSG_OK, dataManager.GetSysString(1211));
...@@ -652,7 +652,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -652,7 +652,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wSysMessage = env->addWindow(rect<s32>(315 * xScale, 180 * yScale, 705 * xScale, 360 * yScale), false, dataManager.GetSysString(1216)); wSysMessage = env->addWindow(rect<s32>(315 * xScale, 180 * yScale, 705 * xScale, 360 * yScale), false, dataManager.GetSysString(1216));
wSysMessage->getCloseButton()->setVisible(false); wSysMessage->getCloseButton()->setVisible(false);
wSysMessage->setVisible(false); wSysMessage->setVisible(false);
ChangeToIGUIImageWindow(wSysMessage, bgSysMessage, imageManager.tDialog_L); ChangeToIGUIImageWindow(wSysMessage, &bgSysMessage, imageManager.tDialog_L);
stSysMessage = env->addStaticText(L"", rect<s32>(20 * xScale, 20 * yScale, 370 * xScale, 100 * yScale), false, true, wSysMessage, -1, false); stSysMessage = env->addStaticText(L"", rect<s32>(20 * xScale, 20 * yScale, 370 * xScale, 100 * yScale), false, true, wSysMessage, -1, false);
stSysMessage->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER); stSysMessage->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER);
btnSysMsgOK = env->addButton(rect<s32>(130 * xScale, 120 * yScale, 260 * xScale, 170 * yScale), wSysMessage, BUTTON_SYS_MSG_OK, dataManager.GetSysString(1211)); btnSysMsgOK = env->addButton(rect<s32>(130 * xScale, 120 * yScale, 260 * xScale, 170 * yScale), wSysMessage, BUTTON_SYS_MSG_OK, dataManager.GetSysString(1211));
...@@ -669,7 +669,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -669,7 +669,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wQuery = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(560)); wQuery = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(560));
wQuery->getCloseButton()->setVisible(false); wQuery->getCloseButton()->setVisible(false);
wQuery->setVisible(false); wQuery->setVisible(false);
ChangeToIGUIImageWindow(wQuery, bgQuery, imageManager.tDialog_L); ChangeToIGUIImageWindow(wQuery, &bgQuery, imageManager.tDialog_L);
stQMessage = env->addStaticText(L"", rect<s32>(20 * xScale, 20 * yScale, 370 * xScale, 100 * yScale), false, true, wQuery, -1, false); stQMessage = env->addStaticText(L"", rect<s32>(20 * xScale, 20 * yScale, 370 * xScale, 100 * yScale), false, true, wQuery, -1, false);
stQMessage->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER); stQMessage->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER);
btnYes = env->addButton(rect<s32>(60 * xScale, 120 * yScale, 170 * xScale, 170 * yScale), wQuery, BUTTON_YES, dataManager.GetSysString(1213)); btnYes = env->addButton(rect<s32>(60 * xScale, 120 * yScale, 170 * xScale, 170 * yScale), wQuery, BUTTON_YES, dataManager.GetSysString(1213));
...@@ -680,7 +680,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -680,7 +680,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wSurrender = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(560)); wSurrender = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(560));
wSurrender->getCloseButton()->setVisible(false); wSurrender->getCloseButton()->setVisible(false);
wSurrender->setVisible(false); wSurrender->setVisible(false);
ChangeToIGUIImageWindow(wSurrender, bgSurrender, imageManager.tDialog_L); ChangeToIGUIImageWindow(wSurrender, &bgSurrender, imageManager.tDialog_L);
stSurrenderMessage = env->addStaticText(dataManager.GetSysString(1359), rect<s32>(20 * xScale, 20 * yScale, 350 * xScale, 100 * yScale), false, true, wSurrender, -1, false); stSurrenderMessage = env->addStaticText(dataManager.GetSysString(1359), rect<s32>(20 * xScale, 20 * yScale, 350 * xScale, 100 * yScale), false, true, wSurrender, -1, false);
stSurrenderMessage->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER); stSurrenderMessage->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER);
btnSurrenderYes = env->addButton(rect<s32>(60 * xScale, 120 * yScale, 170 * xScale, 170 * yScale), wSurrender, BUTTON_SURRENDER_YES, dataManager.GetSysString(1213)); btnSurrenderYes = env->addButton(rect<s32>(60 * xScale, 120 * yScale, 170 * xScale, 170 * yScale), wSurrender, BUTTON_SURRENDER_YES, dataManager.GetSysString(1213));
...@@ -716,7 +716,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -716,7 +716,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wPosSelect = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(561)); wPosSelect = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(561));
wPosSelect->getCloseButton()->setVisible(false); wPosSelect->getCloseButton()->setVisible(false);
wPosSelect->setVisible(false); wPosSelect->setVisible(false);
ChangeToIGUIImageWindow(wPosSelect, bgPosSelect, imageManager.tDialog_L); ChangeToIGUIImageWindow(wPosSelect, &bgPosSelect, imageManager.tDialog_L);
btnPSAU = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(50 * xScale, 25 * yScale, 190 * xScale, 165 * yScale), wPosSelect, BUTTON_POS_AU); btnPSAU = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(50 * xScale, 25 * yScale, 190 * xScale, 165 * yScale), wPosSelect, BUTTON_POS_AU);
btnPSAU->setImageSize(core::dimension2di(CARD_IMG_WIDTH * 0.5f * yScale, CARD_IMG_HEIGHT * 0.5f * yScale)); btnPSAU->setImageSize(core::dimension2di(CARD_IMG_WIDTH * 0.5f * yScale, CARD_IMG_HEIGHT * 0.5f * yScale));
btnPSAD = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(200 * xScale, 25 * yScale, 340 * xScale, 165 * yScale), wPosSelect, BUTTON_POS_AD); btnPSAD = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(200 * xScale, 25 * yScale, 340 * xScale, 165 * yScale), wPosSelect, BUTTON_POS_AD);
...@@ -734,7 +734,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -734,7 +734,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wCardSelect = env->addWindow(rect<s32>(320 * xScale, 55 * yScale, 1000 * xScale, 400 * yScale), false, L""); wCardSelect = env->addWindow(rect<s32>(320 * xScale, 55 * yScale, 1000 * xScale, 400 * yScale), false, L"");
wCardSelect->getCloseButton()->setVisible(false); wCardSelect->getCloseButton()->setVisible(false);
wCardSelect->setVisible(false); wCardSelect->setVisible(false);
ChangeToIGUIImageWindow(wCardSelect, bgCardSelect, imageManager.tDialog_L); ChangeToIGUIImageWindow(wCardSelect, &bgCardSelect, imageManager.tDialog_L);
stCardSelect = env->addStaticText(L"", rect<s32>(20 * xScale, 10 * yScale, 660 * xScale, 40 * yScale), false, false, wCardSelect, -1, false); stCardSelect = env->addStaticText(L"", rect<s32>(20 * xScale, 10 * yScale, 660 * xScale, 40 * yScale), false, false, wCardSelect, -1, false);
stCardSelect->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER); stCardSelect->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
for(int i = 0; i < 5; ++i) { for(int i = 0; i < 5; ++i) {
...@@ -751,7 +751,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -751,7 +751,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wCardDisplay = env->addWindow(rect<s32>(320 * xScale, 55 * yScale, 1000 * xScale, 400 * yScale), false, L""); wCardDisplay = env->addWindow(rect<s32>(320 * xScale, 55 * yScale, 1000 * xScale, 400 * yScale), false, L"");
wCardDisplay->getCloseButton()->setVisible(false); wCardDisplay->getCloseButton()->setVisible(false);
wCardDisplay->setVisible(false); wCardDisplay->setVisible(false);
ChangeToIGUIImageWindow(wCardDisplay, bgCardDisplay, imageManager.tDialog_L); ChangeToIGUIImageWindow(wCardDisplay, &bgCardDisplay, imageManager.tDialog_L);
stCardDisplay = env->addStaticText(L"", rect<s32>(20 * xScale, 10 * yScale, 660 * xScale, 40 * yScale), false, false, wCardDisplay, -1, false); stCardDisplay = env->addStaticText(L"", rect<s32>(20 * xScale, 10 * yScale, 660 * xScale, 40 * yScale), false, false, wCardDisplay, -1, false);
stCardDisplay->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER); stCardDisplay->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
for(int i = 0; i < 5; ++i) { for(int i = 0; i < 5; ++i) {
...@@ -769,7 +769,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -769,7 +769,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wANNumber = env->addWindow(rect<s32>(500 * xScale, 50 * yScale, 800 * xScale, 470 * yScale), false, L""); wANNumber = env->addWindow(rect<s32>(500 * xScale, 50 * yScale, 800 * xScale, 470 * yScale), false, L"");
wANNumber->getCloseButton()->setVisible(false); wANNumber->getCloseButton()->setVisible(false);
wANNumber->setVisible(false); wANNumber->setVisible(false);
ChangeToIGUIImageWindow(wANNumber, bgANNumber, imageManager.tWindow_V); ChangeToIGUIImageWindow(wANNumber, &bgANNumber, imageManager.tWindow_V);
cbANNumber = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(30 * xScale, 180 * yScale, 270 * xScale, 240 * yScale), wANNumber, -1); cbANNumber = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(30 * xScale, 180 * yScale, 270 * xScale, 240 * yScale), wANNumber, -1);
cbANNumber->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER); cbANNumber->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
stANNumber = env->addStaticText(L"", rect<s32>(20 * xScale, 10 * yScale, 280 * xScale, 40 * yScale), false, false, wANNumber, -1, false); stANNumber = env->addStaticText(L"", rect<s32>(20 * xScale, 10 * yScale, 280 * xScale, 40 * yScale), false, false, wANNumber, -1, false);
...@@ -786,7 +786,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -786,7 +786,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wANCard = env->addWindow(rect<s32>(500 * xScale, 50 * yScale, 800 * xScale, 550 * yScale), false, L""); wANCard = env->addWindow(rect<s32>(500 * xScale, 50 * yScale, 800 * xScale, 550 * yScale), false, L"");
wANCard->getCloseButton()->setVisible(false); wANCard->getCloseButton()->setVisible(false);
wANCard->setVisible(false); wANCard->setVisible(false);
ChangeToIGUIImageWindow(wANCard, bgANCard, imageManager.tDialog_S); ChangeToIGUIImageWindow(wANCard, &bgANCard, imageManager.tDialog_S);
stANCard = env->addStaticText(L"", rect<s32>(20 * xScale, 10 * yScale, 280 * xScale, 40 * yScale), false, false, wANCard, -1, false); stANCard = env->addStaticText(L"", rect<s32>(20 * xScale, 10 * yScale, 280 * xScale, 40 * yScale), false, false, wANCard, -1, false);
stANCard->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER); stANCard->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
ebANCard = CAndroidGUIEditBox::addAndroidEditBox(L"", true, env, rect<s32>(10 * xScale, 50 * yScale, 290 * xScale, 90 * yScale), wANCard, EDITBOX_ANCARD); ebANCard = CAndroidGUIEditBox::addAndroidEditBox(L"", true, env, rect<s32>(10 * xScale, 50 * yScale, 290 * xScale, 90 * yScale), wANCard, EDITBOX_ANCARD);
...@@ -798,7 +798,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -798,7 +798,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wANAttribute = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(562)); wANAttribute = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(562));
wANAttribute->getCloseButton()->setVisible(false); wANAttribute->getCloseButton()->setVisible(false);
wANAttribute->setVisible(false); wANAttribute->setVisible(false);
ChangeToIGUIImageWindow(wANAttribute, bgANAttribute, imageManager.tDialog_L); ChangeToIGUIImageWindow(wANAttribute, &bgANAttribute, imageManager.tDialog_L);
stANAttribute = env->addStaticText(L"", rect<s32>(20 * xScale, 10 * yScale, 370 * xScale, 40 * yScale), false, false, wANAttribute, -1, false); stANAttribute = env->addStaticText(L"", rect<s32>(20 * xScale, 10 * yScale, 370 * xScale, 40 * yScale), false, false, wANAttribute, -1, false);
stANAttribute->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER); stANAttribute->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
for(int filter = 0x1, i = 0; i < 7; filter <<= 1, ++i) for(int filter = 0x1, i = 0; i < 7; filter <<= 1, ++i)
...@@ -808,7 +808,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -808,7 +808,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wANRace = env->addWindow(rect<s32>(500 * xScale, 50 * yScale, 800 * xScale, 550 * yScale), false, dataManager.GetSysString(563)); wANRace = env->addWindow(rect<s32>(500 * xScale, 50 * yScale, 800 * xScale, 550 * yScale), false, dataManager.GetSysString(563));
wANRace->getCloseButton()->setVisible(false); wANRace->getCloseButton()->setVisible(false);
wANRace->setVisible(false); wANRace->setVisible(false);
ChangeToIGUIImageWindow(wANRace, bgANRace, imageManager.tDialog_S); ChangeToIGUIImageWindow(wANRace, &bgANRace, imageManager.tDialog_S);
stANRace = env->addStaticText(L"", rect<s32>(20 * xScale, 10 * yScale, 280 * xScale, 40 * yScale), false, false, wANRace, -1, false); stANRace = env->addStaticText(L"", rect<s32>(20 * xScale, 10 * yScale, 280 * xScale, 40 * yScale), false, false, wANRace, -1, false);
stANRace->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER); stANRace->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
for(int filter = 0x1, i = 0; i < 25; filter <<= 1, ++i) for(int filter = 0x1, i = 0; i < 25; filter <<= 1, ++i)
...@@ -854,14 +854,14 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -854,14 +854,14 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wDeckEdit->getCloseButton()->setVisible(false); wDeckEdit->getCloseButton()->setVisible(false);
wDeckEdit->setDrawTitlebar(false); wDeckEdit->setDrawTitlebar(false);
wDeckEdit->setVisible(false); wDeckEdit->setVisible(false);
ChangeToIGUIImageWindow(wDeckEdit, bgDeckEdit, imageManager.tDialog_L); ChangeToIGUIImageWindow(wDeckEdit, &bgDeckEdit, imageManager.tDialog_L);
btnManageDeck = env->addButton(rect<s32>(225 * xScale, 5 * yScale, 290 * xScale, 30 * yScale), wDeckEdit, BUTTON_MANAGE_DECK, dataManager.GetSysString(1460)); btnManageDeck = env->addButton(rect<s32>(225 * xScale, 5 * yScale, 290 * xScale, 30 * yScale), wDeckEdit, BUTTON_MANAGE_DECK, dataManager.GetSysString(1460));
ChangeToIGUIImageButton(btnManageDeck, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnManageDeck, imageManager.tButton_S, imageManager.tButton_S_pressed);
//deck manage //deck manage
wDeckManage = env->addWindow(rect<s32>(530 * xScale, 10 * yScale, 920 * xScale, 460 * yScale), false, dataManager.GetSysString(1460), 0, WINDOW_DECK_MANAGE); wDeckManage = env->addWindow(rect<s32>(530 * xScale, 10 * yScale, 920 * xScale, 460 * yScale), false, dataManager.GetSysString(1460), 0, WINDOW_DECK_MANAGE);
wDeckManage->setVisible(false); wDeckManage->setVisible(false);
wDeckManage->getCloseButton()->setVisible(false); wDeckManage->getCloseButton()->setVisible(false);
ChangeToIGUIImageWindow(wDeckManage, bgDeckManage, imageManager.tWindow_V); ChangeToIGUIImageWindow(wDeckManage, &bgDeckManage, imageManager.tWindow_V);
lstCategories = env->addListBox(rect<s32>(20 * xScale, 20 * yScale, 110 * xScale, 430 * yScale), wDeckManage, LISTBOX_CATEGORIES, true); lstCategories = env->addListBox(rect<s32>(20 * xScale, 20 * yScale, 110 * xScale, 430 * yScale), wDeckManage, LISTBOX_CATEGORIES, true);
lstCategories->setItemHeight(30 * yScale); lstCategories->setItemHeight(30 * yScale);
lstDecks = env->addListBox(rect<s32>(115 * xScale, 20 * yScale, 280 * xScale, 430 * yScale), wDeckManage, LISTBOX_DECKS, true); lstDecks = env->addListBox(rect<s32>(115 * xScale, 20 * yScale, 280 * xScale, 430 * yScale), wDeckManage, LISTBOX_DECKS, true);
...@@ -889,7 +889,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -889,7 +889,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wDMQuery->getCloseButton()->setVisible(false); wDMQuery->getCloseButton()->setVisible(false);
wDMQuery->setVisible(false); wDMQuery->setVisible(false);
wDMQuery->setDraggable(false); wDMQuery->setDraggable(false);
ChangeToIGUIImageWindow(wDMQuery, bgDMQuery, imageManager.tDialog_L); ChangeToIGUIImageWindow(wDMQuery, &bgDMQuery, imageManager.tDialog_L);
stDMMessage = env->addStaticText(L"", rect<s32>(20 * xScale, 25 * yScale, 290 * xScale, 45 * yScale), false, false, wDMQuery); stDMMessage = env->addStaticText(L"", rect<s32>(20 * xScale, 25 * yScale, 290 * xScale, 45 * yScale), false, false, wDMQuery);
stDMMessage2 = env->addStaticText(L"", rect<s32>(20 * xScale, 50 * yScale, 330 * xScale, 90 * yScale), false, false, wDMQuery, -1, true); stDMMessage2 = env->addStaticText(L"", rect<s32>(20 * xScale, 50 * yScale, 330 * xScale, 90 * yScale), false, false, wDMQuery, -1, true);
stDMMessage2->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER); stDMMessage2->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
...@@ -952,7 +952,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -952,7 +952,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wFilter->setDrawTitlebar(false); wFilter->setDrawTitlebar(false);
wFilter->setDraggable(false); wFilter->setDraggable(false);
wFilter->setVisible(false); wFilter->setVisible(false);
ChangeToIGUIImageWindow(wFilter, bgFilter, imageManager.tDialog_L); ChangeToIGUIImageWindow(wFilter, &bgFilter, imageManager.tDialog_L);
env->addStaticText(dataManager.GetSysString(1311), rect<s32>(10 * xScale, 5 * yScale, 70 * xScale, 25 * yScale), false, false, wFilter); env->addStaticText(dataManager.GetSysString(1311), rect<s32>(10 * xScale, 5 * yScale, 70 * xScale, 25 * yScale), false, false, wFilter);
cbCardType = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(60 * xScale, 3 * yScale, 120 * xScale, 23 * yScale), wFilter, COMBOBOX_MAINTYPE); cbCardType = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(60 * xScale, 3 * yScale, 120 * xScale, 23 * yScale), wFilter, COMBOBOX_MAINTYPE);
cbCardType->addItem(dataManager.GetSysString(1310)); cbCardType->addItem(dataManager.GetSysString(1310));
...@@ -1013,7 +1013,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -1013,7 +1013,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wCategories->setDrawTitlebar(false); wCategories->setDrawTitlebar(false);
wCategories->setDraggable(false); wCategories->setDraggable(false);
wCategories->setVisible(false); wCategories->setVisible(false);
ChangeToIGUIImageWindow(wCategories, bgCategories, imageManager.tDialog_L); ChangeToIGUIImageWindow(wCategories, &bgCategories, imageManager.tDialog_L);
btnCategoryOK = env->addButton(rect<s32>(135 * xScale, 175 * yScale, 235 * xScale, 200 * yScale), wCategories, BUTTON_CATEGORY_OK, dataManager.GetSysString(1211)); btnCategoryOK = env->addButton(rect<s32>(135 * xScale, 175 * yScale, 235 * xScale, 200 * yScale), wCategories, BUTTON_CATEGORY_OK, dataManager.GetSysString(1211));
for(int i = 0; i < 32; ++i) for(int i = 0; i < 32; ++i)
chkCategory[i] = env->addCheckBox(false, recti((10 + (i % 4) * 90) * xScale, (10 + (i / 4) * 20) * yScale, (100 + (i % 4) * 90) * xScale, (40 + (i / 4) * 20) * yScale), wCategories, -1, dataManager.GetSysString(1100 + i)); chkCategory[i] = env->addCheckBox(false, recti((10 + (i % 4) * 90) * xScale, (10 + (i / 4) * 20) * yScale, (100 + (i % 4) * 90) * xScale, (40 + (i / 4) * 20) * yScale), wCategories, -1, dataManager.GetSysString(1100 + i));
...@@ -1032,7 +1032,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -1032,7 +1032,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wLinkMarks->setDrawTitlebar(false); wLinkMarks->setDrawTitlebar(false);
wLinkMarks->setDraggable(false); wLinkMarks->setDraggable(false);
wLinkMarks->setVisible(false); wLinkMarks->setVisible(false);
ChangeToIGUIImageWindow(wLinkMarks, bgLinkMarks, imageManager.tWindow_V); ChangeToIGUIImageWindow(wLinkMarks, &bgLinkMarks, imageManager.tWindow_V);
btnMarksOK = env->addButton(recti(80 * xScale, 80 * yScale, 140 * xScale, 140 * yScale), wLinkMarks, BUTTON_MARKERS_OK, dataManager.GetSysString(1211)); btnMarksOK = env->addButton(recti(80 * xScale, 80 * yScale, 140 * xScale, 140 * yScale), wLinkMarks, BUTTON_MARKERS_OK, dataManager.GetSysString(1211));
ChangeToIGUIImageButton(btnMarksOK, imageManager.tButton_C, imageManager.tButton_C_pressed); ChangeToIGUIImageButton(btnMarksOK, imageManager.tButton_C, imageManager.tButton_C_pressed);
btnMark[0] = env->addButton(recti(10 * xScale, 10 * yScale, 70 * xScale, 70 * yScale), wLinkMarks, -1, L"\u2196"); btnMark[0] = env->addButton(recti(10 * xScale, 10 * yScale, 70 * xScale, 70 * yScale), wLinkMarks, -1, L"\u2196");
...@@ -1135,7 +1135,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -1135,7 +1135,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
wReplaySave = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(1340)); wReplaySave = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(1340));
wReplaySave->getCloseButton()->setVisible(false); wReplaySave->getCloseButton()->setVisible(false);
wReplaySave->setVisible(false); wReplaySave->setVisible(false);
ChangeToIGUIImageWindow(wReplaySave, bgReplaySave, imageManager.tDialog_L); ChangeToIGUIImageWindow(wReplaySave, &bgReplaySave, imageManager.tDialog_L);
env->addStaticText(dataManager.GetSysString(1342), rect<s32>(20 * xScale, 25 * yScale, 290 * xScale, 45 * yScale), false, false, wReplaySave); env->addStaticText(dataManager.GetSysString(1342), rect<s32>(20 * xScale, 25 * yScale, 290 * xScale, 45 * yScale), false, false, wReplaySave);
ebRSName = CAndroidGUIEditBox::addAndroidEditBox(L"", true, env, rect<s32>(20 * xScale, 50 * yScale, 370 * xScale, 90 * yScale), wReplaySave, -1); ebRSName = CAndroidGUIEditBox::addAndroidEditBox(L"", true, env, rect<s32>(20 * xScale, 50 * yScale, 370 * xScale, 90 * yScale), wReplaySave, -1);
ebRSName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER); ebRSName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
...@@ -2064,13 +2064,13 @@ int Game::LocalPlayer(int player) { ...@@ -2064,13 +2064,13 @@ int Game::LocalPlayer(int player) {
const wchar_t* Game::LocalName(int local_player) { const wchar_t* Game::LocalName(int local_player) {
return local_player == 0 ? dInfo.hostname : dInfo.clientname; return local_player == 0 ? dInfo.hostname : dInfo.clientname;
} }
void Game::ChangeToIGUIImageWindow(irr::gui::IGUIWindow* window, irr::gui::IGUIImage* bgwindow, irr::video::ITexture* image) { void Game::ChangeToIGUIImageWindow(irr::gui::IGUIWindow* window, irr::gui::IGUIImage** pWindowBackground, irr::video::ITexture* image) {
window->setDrawBackground(false); window->setDrawBackground(false);
recti pos = window->getRelativePosition(); recti pos = window->getRelativePosition();
bgwindow = env->addImage(rect<s32>(0, 0, pos.getWidth(), pos.getHeight()), window, -1, 0, true); *pWindowBackground = env->addImage(rect<s32>(0, 0, pos.getWidth(), pos.getHeight()), window, -1, 0, true);
irr::gui::IGUIImage* bgwindow = *pWindowBackground;
bgwindow->setImage(image); bgwindow->setImage(image);
bgwindow->setScaleImage(true); bgwindow->setScaleImage(true);
} }
void Game::ChangeToIGUIImageButton(irr::gui::IGUIButton* button, irr::video::ITexture* image, irr::video::ITexture* pressedImage, irr::gui::CGUITTFont* font) { void Game::ChangeToIGUIImageButton(irr::gui::IGUIButton* button, irr::video::ITexture* image, irr::video::ITexture* pressedImage, irr::gui::CGUITTFont* font) {
button->setDrawBorder(false); button->setDrawBorder(false);
......
Classes/gframe/game.h
View file @ 0e9e4442
...@@ -183,7 +183,7 @@ public: ...@@ -183,7 +183,7 @@ public:
void CloseGameWindow(); void CloseGameWindow();
void CloseDuelWindow(); void CloseDuelWindow();
void OnGameClose(); void OnGameClose();
void ChangeToIGUIImageWindow(irr::gui::IGUIWindow* window, irr::gui::IGUIImage* bgwindow, irr::video::ITexture* image); void ChangeToIGUIImageWindow(irr::gui::IGUIWindow* window, irr::gui::IGUIImage** pWindowBackground, irr::video::ITexture* image);
void ChangeToIGUIImageButton(irr::gui::IGUIButton* button, irr::video::ITexture* image, irr::video::ITexture* pressedImage, irr::gui::CGUITTFont* font=0); void ChangeToIGUIImageButton(irr::gui::IGUIButton* button, irr::video::ITexture* image, irr::video::ITexture* pressedImage, irr::gui::CGUITTFont* font=0);
int LocalPlayer(int player); int LocalPlayer(int player);
......
mobile/assets_ko/data/conf/strings.conf
View file @ 0e9e4442
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
!system 1074 펜듈럼 !system 1074 펜듈럼
!system 1075 특수 소환 !system 1075 특수 소환
!system 1076 링크 !system 1076 링크
!system 1077 효과 없음 !system 1077 효과 이외
!system 1080 (N/A) !system 1080 (N/A)
!system 1081 엑스트라 몬스터 존 !system 1081 엑스트라 몬스터 존
#GUI #GUI
...@@ -418,12 +418,12 @@ ...@@ -418,12 +418,12 @@
!system 1373 이름↓ !system 1373 이름↓
!system 1374 링크 마커 !system 1374 링크 마커
!system 1378 여러 키워드로 카드 검색 !system 1378 여러 키워드로 카드 검색
!system 1379 확장 카드 디버그 모드 사용 !system 1379 확장 카드 패키지 사용 (다음 듀얼에서 유효)
!system 1380 AI 모드 !system 1380 AI 모드 (둘 다 제한 없음)
!system 1381 퍼즐 모드 !system 1381 퍼즐 모드 (모든 교육 포함)
!system 1382 AI 정보: !system 1382 AI 정보:
!system 1384 가위만 내는 AI !system 1384 가위만 내는 AI
!system 1385 덱 목록이 비어 있거나 알맞지 않은 카드가 있을 수 있습니다. !system 1385 이 모드는 아직 구현되지 않았습니다.
!system 1390 기다리는 중... !system 1390 기다리는 중...
!system 1391 기다리는 중.... !system 1391 기다리는 중....
!system 1392 기다리는 중..... !system 1392 기다리는 중.....
...@@ -433,7 +433,7 @@ ...@@ -433,7 +433,7 @@
!system 1403 호스트에 들어갈 수 없습니다. !system 1403 호스트에 들어갈 수 없습니다.
!system 1404 비밀번호가 맞지 않습니다. !system 1404 비밀번호가 맞지 않습니다.
!system 1405 호스트가 거절했습니다. !system 1405 호스트가 거절했습니다.
!system 1406 덱이 충분하지 않습니다 !system 1406 덱이 충분하지 않습니다.
!system 1407 [%ls]이(가) 안 맞습니다. OCG&TCG룰과 금지/제한 리스트를 확인하삽시오. !system 1407 [%ls]이(가) 안 맞습니다. OCG&TCG룰과 금지/제한 리스트를 확인하삽시오.
!system 1408 사이드 덱 교체에 실패했습니다. !system 1408 사이드 덱 교체에 실패했습니다.
!system 1409 사이드 덱 교체 중... !system 1409 사이드 덱 교체 중...
...@@ -649,7 +649,7 @@ ...@@ -649,7 +649,7 @@
!setname 0x1 얼리 오브 저스티스(정발명:A·O·J) !setname 0x1 얼리 오브 저스티스(정발명:A·O·J)
!setname 0x2 제넥스 !setname 0x2 제넥스
!setname 0x1002 리얼 제넥스(정발명:레알 제넥스) !setname 0x1002 리얼 제넥스(정발명:레알 제넥스)
#setname 0x2002 얼리 제넥스(정발명:A·제넥스) #!setname 0x2002 얼리 제넥스(정발명:A·제넥스)
#setname 0x3 N/A #setname 0x3 N/A
!setname 0x4 아마조네스 !setname 0x4 아마조네스
!setname 0x5 아르카나 포스 !setname 0x5 아르카나 포스
...@@ -785,7 +785,7 @@ ...@@ -785,7 +785,7 @@
!setname 0x64 하피(정발명:해피) !setname 0x64 하피(정발명:해피)
!setname 0x65 침략의 !setname 0x65 침략의
!setname 0x66 워리어 !setname 0x66 워리어
!setname 0x1066 사운드 워리어(정발명:음향전사) !setname 0x1066 사운드 워리어
!setname 0x2066 마그넷 워리어 !setname 0x2066 마그넷 워리어
#setname 0x67 아이언 #setname 0x67 아이언
#setname 0x68 양철 #setname 0x68 양철
...@@ -832,7 +832,7 @@ ...@@ -832,7 +832,7 @@
!setname 0x1081 염왕수 !setname 0x1081 염왕수
!setname 0x82 도도도 !setname 0x82 도도도
!setname 0x83 퍼핏 !setname 0x83 퍼핏
!setname 0x1083 기믹 !setname 0x1083 기믹 퍼핏
!setname 0x84 BK(버닝 너클러)(정발명:버닝나쿠라) !setname 0x84 BK(버닝 너클러)(정발명:버닝나쿠라)
!setname 0x85 SD(슈퍼 디펜스)로보 !setname 0x85 SD(슈퍼 디펜스)로보
!setname 0x86 홀리 라이트닝 !setname 0x86 홀리 라이트닝
...@@ -898,12 +898,12 @@ ...@@ -898,12 +898,12 @@
!setname 0xb5 령수 !setname 0xb5 령수
!setname 0x10b5 령수사 !setname 0x10b5 령수사
!setname 0x20b5 정령수 !setname 0x20b5 정령수
#setname 0x30b5 정령수사 #!setname 0x30b5 정령수사
!setname 0x40b5 성령수기 !setname 0x40b5 성령수기
!setname 0xb6 외신 !setname 0xb6 외신
!setname 0xb7 구신 !setname 0xb7 구신
!setname 0xb8 고신 !setname 0xb8 고신
!setname 0xb9 블레이즈 캐논 !setname 0xb9 블레이즈 캐논(정발명:브레이즈 캐논)
!setname 0xba RR(레이드 랩터즈) !setname 0xba RR(레이드 랩터즈)
!setname 0xbb 인페르노이드 !setname 0xbb 인페르노이드
!setname 0xbc 인조인간 !setname 0xbc 인조인간
...@@ -962,7 +962,7 @@ ...@@ -962,7 +962,7 @@
!setname 0xe9 자석의 전사 !setname 0xe9 자석의 전사
!setname 0xea 크리스트론 !setname 0xea 크리스트론
!setname 0xeb 화합수(정발명:화합야수) !setname 0xeb 화합수(정발명:화합야수)
#setname 0xec 마계 #!setname 0xec 마계
!setname 0x10ec 마계극단 !setname 0x10ec 마계극단
!setname 0x20ec 마계대본 !setname 0x20ec 마계대본
!setname 0xed 서브테러 !setname 0xed 서브테러
...@@ -982,7 +982,7 @@ ...@@ -982,7 +982,7 @@
!setname 0xf5 간드라 !setname 0xf5 간드라
!setname 0xf6 마천루 !setname 0xf6 마천루
!setname 0xf7 LL(리리컬 루스키니아) !setname 0xf7 LL(리리컬 루스키니아)
#setname 0xf8 패왕 #!setname 0xf8 패왕
!setname 0x10f8 패왕문 !setname 0x10f8 패왕문
!setname 0x20f8 패왕권룡 !setname 0x20f8 패왕권룡
!setname 0xf9 진룡 !setname 0xf9 진룡
...@@ -1067,7 +1067,7 @@ ...@@ -1067,7 +1067,7 @@
!setname 0x2142 엘드릭실(정발명:엘드릭시르) !setname 0x2142 엘드릭실(정발명:엘드릭시르)
!setname 0x143 황금향 !setname 0x143 황금향
!setname 0x144 환마 !setname 0x144 환마
!setname 0x145 드라그마 !setname 0x145 드래그마
!setname 0x146 메르피 !setname 0x146 메르피
!setname 0x147 포탄(ポータン) !setname 0x147 포탄(ポータン)
!setname 0x148 롤랑 !setname 0x148 롤랑
......
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