Skip to content

Y
ygopro
Commit 5df3ab32 authored by xiaoye's avatar xiaoye
Browse files
Options

fix

parent ce9f063b
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 9 deletions
gframe/game.cpp
View file @ 5df3ab32
...@@ -361,15 +361,15 @@ bool Game::Initialize() { ...@@ -361,15 +361,15 @@ bool Game::Initialize() {
btnHostPrepStart = env->addButton(irr::core::rect<irr::s32>(230, 280, 340, 305), wHostPrepare, BUTTON_HP_START, dataManager.GetSysString(1215)); btnHostPrepStart = env->addButton(irr::core::rect<irr::s32>(230, 280, 340, 305), wHostPrepare, BUTTON_HP_START, dataManager.GetSysString(1215));
btnHostPrepCancel = env->addButton(irr::core::rect<irr::s32>(350, 280, 460, 305), wHostPrepare, BUTTON_HP_CANCEL, dataManager.GetSysString(1210)); btnHostPrepCancel = env->addButton(irr::core::rect<irr::s32>(350, 280, 460, 305), wHostPrepare, BUTTON_HP_CANCEL, dataManager.GetSysString(1210));
//server list //server list
wServerList = env->addWindow(irr::core::rect<irr::s32>(10, 80, 380, 400), false, dataManager.GetSysString(1239)); wServerList = env->addWindow(irr::core::rect<irr::s32>(25, 80, 325, 400), false, dataManager.GetSysString(1239));
wServerList->getCloseButton()->setVisible(false); wServerList->getCloseButton()->setVisible(false);
wServerList->setVisible(false); wServerList->setVisible(false);
wServerList->setDraggable(false); wServerList->setDraggable(true);
lstServerList = env->addListBox(irr::core::rect<irr::s32>(0, 20, 370, 270), wServerList, LISTBOX_SERVER_LIST, true); lstServerList = env->addListBox(irr::core::rect<irr::s32>(10, 20, 290, 270), wServerList, LISTBOX_SERVER_LIST, true);
lstServerList->setItemHeight(18); lstServerList->setItemHeight(18);
AddServerList(lstServerList); AddServerList(lstServerList);
btnServerSelected = env->addButton(irr::core::rect<irr::s32>(10, 280, 100, 310), wServerList, BUTTON_SERVER_SELECTED, dataManager.GetSysString(1211)); btnServerSelected = env->addButton(irr::core::rect<irr::s32>(30, 280, 130, 310), wServerList, BUTTON_SERVER_SELECTED, dataManager.GetSysString(1211));
btnServerCancel = env->addButton(irr::core::rect<irr::s32>(280, 280, 370, 310), wServerList, BUTTON_SERVER_CANCEL, dataManager.GetSysString(1212)); btnServerCancel = env->addButton(irr::core::rect<irr::s32>(170, 280, 270, 310), wServerList, BUTTON_SERVER_CANCEL, dataManager.GetSysString(1212));
//img //img
wCardImg = env->addStaticText(L"", irr::core::rect<irr::s32>(1, 1, 1 + CARD_IMG_WIDTH + 20, 1 + CARD_IMG_HEIGHT + 18), true, false, 0, -1, true); wCardImg = env->addStaticText(L"", irr::core::rect<irr::s32>(1, 1, 1 + CARD_IMG_WIDTH + 20, 1 + CARD_IMG_HEIGHT + 18), true, false, 0, -1, true);
wCardImg->setBackgroundColor(0xc0c0c0c0); wCardImg->setBackgroundColor(0xc0c0c0c0);
......
gframe/menu_handler.cpp
View file @ 5df3ab32
...@@ -90,6 +90,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -90,6 +90,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
break; break;
} }
case BUTTON_JOIN_CANCEL: { case BUTTON_JOIN_CANCEL: {
mainGame->HideElement(mainGame->wServerList);
mainGame->HideElement(mainGame->wLanWindow); mainGame->HideElement(mainGame->wLanWindow);
mainGame->ShowElement(mainGame->wMainMenu); mainGame->ShowElement(mainGame->wMainMenu);
if(exit_on_return) if(exit_on_return)
...@@ -491,10 +492,12 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -491,10 +492,12 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
} }
case BUTTON_SERVER_SELECTED: { case BUTTON_SERVER_SELECTED: {
int sel = mainGame->lstServerList->getSelected(); int sel = mainGame->lstServerList->getSelected();
wcscpy(mainGame->gameConf.lasthost, mainGame->serverIP[sel]); if (selectedIndex != -1) {
wchar_t buf[256]; wcscpy(mainGame->gameConf.lasthost, mainGame->serverIP[sel]);
myswprintf(buf, L"%s", mainGame->gameConf.lasthost); wchar_t buf[256];
mainGame->ebJoinHost->setText(buf); myswprintf(buf, L"%s", mainGame->gameConf.lasthost);
mainGame->ebJoinHost->setText(buf);
}
mainGame->HideElement(mainGame->wServerList); mainGame->HideElement(mainGame->wServerList);
break; break;
} }
......
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