Skip to content

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

Merge branch 'master' into server

parents 6033a3fe 5c2436b3
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 41 deletions
gframe/deck_con.cpp
View file @ e2c381fd
......@@ -62,6 +62,7 @@ static bool check_set_code(const CardDataC& data, int set_code) {
void DeckBuilder::Initialize() {
mainGame->is_building = true;
mainGame->is_siding = false;
mainGame->ShowCardNoInfo();
mainGame->wInfos->setVisible(true);
mainGame->wCardImg->setVisible(true);
mainGame->wDeckEdit->setVisible(true);
......@@ -91,6 +92,7 @@ void DeckBuilder::Initialize() {
}
void DeckBuilder::Terminate() {
mainGame->is_building = false;
mainGame->ShowCardNoInfo();
mainGame->wDeckEdit->setVisible(false);
mainGame->wCategories->setVisible(false);
mainGame->wFilter->setVisible(false);
......@@ -275,8 +277,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
mainGame->env->addMessageBox(L"", dataManager.GetSysString(1410));
break;
}
mainGame->imgCard->setImage(imageManager.tCover[0]);
mainGame->showingcode = 0;
mainGame->ShowCardNoInfo();
char deckbuf[1024];
char* pdeck = deckbuf;
BufferIO::WriteInt32(pdeck, deckManager.current_deck.main.size() + deckManager.current_deck.extra.size());
......
gframe/event_handler.cpp
View file @ e2c381fd
......@@ -981,14 +981,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
if(mcard->code) {
mainGame->ShowCardInfo(mcard->code);
} else {
mainGame->imgCard->setImage(imageManager.tCover[mcard->controler]);
mainGame->showingcode = 0;
mainGame->stName->setText(L"");
mainGame->stInfo->setText(L"");
mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L"");
mainGame->stText->setText(L"");
mainGame->scrCardText->setVisible(false);
mainGame->ShowCardNoInfo(mcard->controler);
}
}
if(id >= BUTTON_DISPLAY_0 && id <= BUTTON_DISPLAY_4) {
......@@ -997,14 +990,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
if(mcard->code) {
mainGame->ShowCardInfo(mcard->code);
} else {
mainGame->imgCard->setImage(imageManager.tCover[mcard->controler]);
mainGame->showingcode = 0;
mainGame->stName->setText(L"");
mainGame->stInfo->setText(L"");
mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L"");
mainGame->stText->setText(L"");
mainGame->scrCardText->setVisible(false);
mainGame->ShowCardNoInfo(mcard->controler);
}
}
break;
......@@ -1580,14 +1566,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
}
} else {
should_show_tip = false;
mainGame->imgCard->setImage(imageManager.tCover[mcard->controler]);
mainGame->showingcode = 0;
mainGame->stName->setText(L"");
mainGame->stInfo->setText(L"");
mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L"");
mainGame->stText->setText(L"");
mainGame->scrCardText->setVisible(false);
mainGame->ShowCardNoInfo(mcard->controler);
}
}
hovered_card = mcard;
......@@ -1855,6 +1834,8 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
}
case CHECKBOX_QUICK_ANIMATION: {
mainGame->gameConf.quick_animation = mainGame->chkQuickAnimation->isChecked() ? 1 : 0;
return true;
break;
}
}
break;
......
gframe/game.cpp
View file @ e2c381fd
......@@ -1641,6 +1641,16 @@ void Game::ShowCardInfo(int code, bool resize) {
const auto& tsize = stText->getRelativePosition();
InitStaticText(stText, tsize.getWidth(), tsize.getHeight(), guiFont, showingtext);
}
void Game::ShowCardNoInfo(int player) {
imgCard->setImage(imageManager.tCover[player]);
showingcode = 0;
stName->setText(L"");
stInfo->setText(L"");
stDataInfo->setText(L"");
stSetName->setText(L"");
stText->setText(L"");
scrCardText->setVisible(false);
}
void Game::AddChatMsg(wchar_t* msg, int player) {
for(int i = 7; i > 0; --i) {
chatMsg[i] = chatMsg[i - 1];
......
gframe/game.h
View file @ e2c381fd
......@@ -165,6 +165,7 @@ public:
void LoadConfig();
void SaveConfig();
void ShowCardInfo(int code, bool resize = false);
void ShowCardNoInfo(int player = 0);
void AddChatMsg(wchar_t* msg, int player);
void ClearChatMsg();
void AddDebugMsg(char* msgbuf);
......
gframe/menu_handler.cpp
View file @ e2c381fd
......@@ -222,17 +222,10 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
if(!ReplayMode::cur_replay.OpenReplay(mainGame->lstReplayList->getListItem(mainGame->lstReplayList->getSelected())))
break;
}
mainGame->imgCard->setImage(imageManager.tCover[0]);
mainGame->showingcode = 0;
mainGame->ShowCardNoInfo();
mainGame->wCardImg->setVisible(true);
mainGame->wInfos->setVisible(true);
mainGame->wReplay->setVisible(true);
mainGame->stName->setText(L"");
mainGame->stInfo->setText(L"");
mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L"");
mainGame->stText->setText(L"");
mainGame->scrCardText->setVisible(false);
mainGame->wReplayControl->setVisible(true);
mainGame->btnReplayStart->setVisible(false);
mainGame->btnReplayPause->setVisible(true);
......
gframe/single_mode.cpp
View file @ e2c381fd
......@@ -86,16 +86,11 @@ int SingleMode::SinglePlayThread(void* param) {
rh.seed = seed;
mainGame->gMutex.Lock();
mainGame->HideElement(mainGame->wSinglePlay);
mainGame->ShowCardNoInfo();
mainGame->wCardImg->setVisible(true);
mainGame->wInfos->setVisible(true);
mainGame->btnLeaveGame->setVisible(true);
mainGame->btnLeaveGame->setText(dataManager.GetSysString(1210));
mainGame->stName->setText(L"");
mainGame->stInfo->setText(L"");
mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L"");
mainGame->stText->setText(L"");
mainGame->scrCardText->setVisible(false);
mainGame->wPhase->setVisible(true);
mainGame->dField.Clear();
mainGame->dInfo.isFirst = true;
......
script @ 85604b1c
Subproject commit 5c5df8834951c68399dbc77c89f7f745bc98f0b9
Subproject commit 85604b1c222fabdad39f18bf1580358d298aaa84
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