Skip to content

Y
ygopro
Commit 14f4b6f9 authored by edo9300's avatar edo9300
Browse files
Options

Updated card info and setcode displaying

parent 482c1894
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 25 deletions
gframe/event_handler.cpp
View file @ 14f4b6f9
...@@ -1113,7 +1113,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1113,7 +1113,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->stDataInfo->setText(L""); mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L""); mainGame->stSetName->setText(L"");
mainGame->stText->setText(L""); mainGame->stText->setText(L"");
mainGame->texty = 0; mainGame->showingcard = 0;
mainGame->scrCardText->setVisible(false); mainGame->scrCardText->setVisible(false);
} }
} }
...@@ -1129,7 +1129,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1129,7 +1129,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->stDataInfo->setText(L""); mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L""); mainGame->stSetName->setText(L"");
mainGame->stText->setText(L""); mainGame->stText->setText(L"");
mainGame->texty = 0; mainGame->showingcard = 0;
mainGame->scrCardText->setVisible(false); mainGame->scrCardText->setVisible(false);
} }
} }
...@@ -1834,7 +1834,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1834,7 +1834,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->stDataInfo->setText(L""); mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L""); mainGame->stSetName->setText(L"");
mainGame->stText->setText(L""); mainGame->stText->setText(L"");
mainGame->texty = 0; mainGame->showingcard = 0;
mainGame->scrCardText->setVisible(false); mainGame->scrCardText->setVisible(false);
} }
} }
......
gframe/game.cpp
View file @ 14f4b6f9
...@@ -66,7 +66,7 @@ bool Game::Initialize() { ...@@ -66,7 +66,7 @@ bool Game::Initialize() {
ignore_chain = false; ignore_chain = false;
chain_when_avail = false; chain_when_avail = false;
is_building = false; is_building = false;
texty = 0; showingcard = 0;
memset(&dInfo, 0, sizeof(DuelInfo)); memset(&dInfo, 0, sizeof(DuelInfo));
memset(chatTiming, 0, sizeof(chatTiming)); memset(chatTiming, 0, sizeof(chatTiming));
deckManager.LoadLFList(); deckManager.LoadLFList();
...@@ -863,6 +863,11 @@ void Game::SetStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, irr::gu ...@@ -863,6 +863,11 @@ void Game::SetStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, irr::gu
for(int j = lsnz + 1; j < i; j++) { for(int j = lsnz + 1; j < i; j++) {
_width += font->getCharDimension(text[j]).Width; _width += font->getCharDimension(text[j]).Width;
} }
if (_width > cWidth) {
temp[lsnz] = L' ';
temp[pbuffer++] = L'\n';
_width = 0;
}
} }
temp[pbuffer++] = c; temp[pbuffer++] = c;
} }
...@@ -1252,6 +1257,7 @@ void Game::PlayBGM() { ...@@ -1252,6 +1257,7 @@ void Game::PlayBGM() {
void Game::ShowCardInfo(int code) { void Game::ShowCardInfo(int code) {
CardData cd; CardData cd;
wchar_t formatBuffer[256]; wchar_t formatBuffer[256];
showingcard = code;
if(!dataManager.GetData(code, &cd)) if(!dataManager.GetData(code, &cd))
memset(&cd, 0, sizeof(CardData)); memset(&cd, 0, sizeof(CardData));
imgCard->setImage(imageManager.GetTexture(code, true)); imgCard->setImage(imageManager.GetTexture(code, true));
...@@ -1260,7 +1266,7 @@ void Game::ShowCardInfo(int code) { ...@@ -1260,7 +1266,7 @@ void Game::ShowCardInfo(int code) {
myswprintf(formatBuffer, L"%ls[%08d]", dataManager.GetName(cd.alias), cd.alias); myswprintf(formatBuffer, L"%ls[%08d]", dataManager.GetName(cd.alias), cd.alias);
else myswprintf(formatBuffer, L"%ls[%08d]", dataManager.GetName(code), code); else myswprintf(formatBuffer, L"%ls[%08d]", dataManager.GetName(code), code);
stName->setText(formatBuffer); stName->setText(formatBuffer);
int offset = 0; int offset = 37;
if(!gameConf.chkHideSetname) { if(!gameConf.chkHideSetname) {
unsigned long long sc = cd.setcode; unsigned long long sc = cd.setcode;
if(cd.alias) { if(cd.alias) {
...@@ -1269,9 +1275,8 @@ void Game::ShowCardInfo(int code) { ...@@ -1269,9 +1275,8 @@ void Game::ShowCardInfo(int code) {
sc = aptr->second.setcode; sc = aptr->second.setcode;
} }
if(sc) { if(sc) {
offset = 23;
myswprintf(formatBuffer, L"%ls%ls", dataManager.GetSysString(1329), dataManager.FormatSetName(sc)); myswprintf(formatBuffer, L"%ls%ls", dataManager.GetSysString(1329), dataManager.FormatSetName(sc));
stSetName->setText(formatBuffer); SetStaticText(stSetName, (296 * window_size.Width / 1024) - 15, textFont, formatBuffer, 0);
} else } else
stSetName->setText(L""); stSetName->setText(L"");
} else { } else {
...@@ -1279,7 +1284,7 @@ void Game::ShowCardInfo(int code) { ...@@ -1279,7 +1284,7 @@ void Game::ShowCardInfo(int code) {
} }
if(cd.type & TYPE_MONSTER) { if(cd.type & TYPE_MONSTER) {
myswprintf(formatBuffer, L"[%ls] %ls/%ls", dataManager.FormatType(cd.type), dataManager.FormatRace(cd.race), dataManager.FormatAttribute(cd.attribute)); myswprintf(formatBuffer, L"[%ls] %ls/%ls", dataManager.FormatType(cd.type), dataManager.FormatRace(cd.race), dataManager.FormatAttribute(cd.attribute));
stInfo->setText(formatBuffer); SetStaticText(stInfo, (296 * window_size.Width / 1024) - 15, textFont, formatBuffer, 0);
if(cd.type & TYPE_LINK){ if(cd.type & TYPE_LINK){
if (cd.attack < 0) if (cd.attack < 0)
myswprintf(formatBuffer, L"?/Link %d ", cd.level); myswprintf(formatBuffer, L"?/Link %d ", cd.level);
...@@ -1307,18 +1312,24 @@ void Game::ShowCardInfo(int code) { ...@@ -1307,18 +1312,24 @@ void Game::ShowCardInfo(int code) {
myswprintf(scaleBuffer, L" %d/%d", cd.lscale, cd.rscale); myswprintf(scaleBuffer, L" %d/%d", cd.lscale, cd.rscale);
wcscat(formatBuffer, scaleBuffer); wcscat(formatBuffer, scaleBuffer);
} }
stDataInfo->setText(formatBuffer); SetStaticText(stDataInfo, (296 * window_size.Width / 1024) - 15, textFont, formatBuffer, 0);
stSetName->setRelativePosition(rect<s32>(15, 83, 316 * window_size.Width / 1024 - 30, 116));
texty = 83 + offset;
} else { } else {
myswprintf(formatBuffer, L"[%ls]", dataManager.FormatType(cd.type)); myswprintf(formatBuffer, L"[%ls]", dataManager.FormatType(cd.type));
stInfo->setText(formatBuffer); SetStaticText(stInfo, (296 * window_size.Width / 1024) - 15, textFont, formatBuffer, 0);
stDataInfo->setText(L""); stDataInfo->setText(L"");
stSetName->setRelativePosition(rect<s32>(15, 60, 316 * window_size.Height / 640, 83));
texty = 60 + offset;
} }
stText->setRelativePosition(rect<s32>(15, texty, 287 * window_size.Width / 1024, 324 * window_size.Height / 640)); stInfo->setRelativePosition(rect<s32>(15, offset, 296 * window_size.Width / 1024, offset + textFont->getDimension(stInfo->getText()).Height));
scrCardText->setRelativePosition(rect<s32>(267 * window_size.Width / 1024, texty, 287 * window_size.Width / 1024, 324 * window_size.Height / 640)); offset += textFont->getDimension(stInfo->getText()).Height;
if(wcscmp(stDataInfo->getText(), L"")) {
stDataInfo->setRelativePosition(rect<s32>(15, offset, 296 * window_size.Width / 1024, offset + textFont->getDimension(stDataInfo->getText()).Height));
offset += textFont->getDimension(stDataInfo->getText()).Height;
}
if(wcscmp(stSetName->getText(), L"")) {
stSetName->setRelativePosition(rect<s32>(15, offset, 296 * window_size.Width / 1024, offset + textFont->getDimension(stSetName->getText()).Height));
offset += textFont->getDimension(stSetName->getText()).Height;
}
stText->setRelativePosition(rect<s32>(15, offset, 287 * window_size.Width / 1024, 324 * window_size.Height / 640));
scrCardText->setRelativePosition(rect<s32>(267 * window_size.Width / 1024, offset, 287 * window_size.Width / 1024, 324 * window_size.Height / 640));
showingtext = dataManager.GetText(code); showingtext = dataManager.GetText(code);
const auto& tsize = stText->getRelativePosition(); const auto& tsize = stText->getRelativePosition();
InitStaticText(stText, tsize.getWidth(), tsize.getHeight(), textFont, showingtext); InitStaticText(stText, tsize.getWidth(), tsize.getHeight(), textFont, showingtext);
...@@ -1611,14 +1622,10 @@ void Game::OnResize() ...@@ -1611,14 +1622,10 @@ void Game::OnResize()
imgCard->setRelativePosition(Resize(10, 9, 10 + CARD_IMG_WIDTH, 9 + CARD_IMG_HEIGHT)); imgCard->setRelativePosition(Resize(10, 9, 10 + CARD_IMG_WIDTH, 9 + CARD_IMG_HEIGHT));
wInfos->setRelativePosition(Resize(1, 275, 301, 639)); wInfos->setRelativePosition(Resize(1, 275, 301, 639));
stName->setRelativePosition(recti(10, 10, 287 * window_size.Width / 1024, 32)); stName->setRelativePosition(recti(10, 10, 287 * window_size.Width / 1024, 32));
stInfo->setRelativePosition(recti(15, 37, 296 * window_size.Width / 1024, 60));
stDataInfo->setRelativePosition(recti(15, 60, 296 * window_size.Width / 1024, 83));
stText->setRelativePosition(recti(15, texty, 287 * window_size.Width / 1024, 324 * window_size.Height / 640));
scrCardText->setRelativePosition(rect<s32>(267 * window_size.Width / 1024, texty, 287 * window_size.Width / 1024, 324 * window_size.Height / 640));
lstLog->setRelativePosition(Resize(10, 10, 290, 290)); lstLog->setRelativePosition(Resize(10, 10, 290, 290));
const auto& tsize = stText->getRelativePosition(); const auto& tsize = stText->getRelativePosition();
if(texty) if(showingcard)
InitStaticText(stText, tsize.getWidth(), tsize.getHeight(), textFont, showingtext); ShowCardInfo(showingcard);
btnClearLog->setRelativePosition(Resize(160, 300, 260, 325)); btnClearLog->setRelativePosition(Resize(160, 300, 260, 325));
srcVolume->setRelativePosition(rect<s32>(85, 295, wInfos->getRelativePosition().LowerRightCorner.X - 21, 310)); srcVolume->setRelativePosition(rect<s32>(85, 295, wInfos->getRelativePosition().LowerRightCorner.X - 21, 310));
......
gframe/game.h
View file @ 14f4b6f9
...@@ -194,7 +194,7 @@ public: ...@@ -194,7 +194,7 @@ public:
bool is_siding; bool is_siding;
int forbiddentypes; int forbiddentypes;
uint32 duel_param; uint32 duel_param;
int texty; uint32 showingcard;
irr::core::dimension2d<irr::u32> window_size; irr::core::dimension2d<irr::u32> window_size;
......
gframe/menu_handler.cpp
View file @ 14f4b6f9
...@@ -283,7 +283,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -283,7 +283,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
mainGame->stDataInfo->setText(L""); mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L""); mainGame->stSetName->setText(L"");
mainGame->stText->setText(L""); mainGame->stText->setText(L"");
mainGame->texty = 0; mainGame->showingcard = 0;
mainGame->scrCardText->setVisible(false); mainGame->scrCardText->setVisible(false);
mainGame->wReplayControl->setVisible(true); mainGame->wReplayControl->setVisible(true);
mainGame->btnReplayStart->setVisible(false); mainGame->btnReplayStart->setVisible(false);
......
gframe/single_mode.cpp
View file @ 14f4b6f9
...@@ -78,7 +78,7 @@ int SingleMode::SinglePlayThread(void* param) { ...@@ -78,7 +78,7 @@ int SingleMode::SinglePlayThread(void* param) {
mainGame->stDataInfo->setText(L""); mainGame->stDataInfo->setText(L"");
mainGame->stSetName->setText(L""); mainGame->stSetName->setText(L"");
mainGame->stText->setText(L""); mainGame->stText->setText(L"");
mainGame->texty = 0; mainGame->showingcard = 0;
mainGame->scrCardText->setVisible(false); mainGame->scrCardText->setVisible(false);
mainGame->wPhase->setVisible(true); mainGame->wPhase->setVisible(true);
mainGame->dField.Clear(); mainGame->dField.Clear();
......
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