Skip to content

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

Fixed stat on oppo's extra zones, changed buttons position

parent afc25bae
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 14 deletions
gframe/client_card.cpp
View file @ c54f2e09
...@@ -42,6 +42,7 @@ ClientCard::ClientCard() { ...@@ -42,6 +42,7 @@ ClientCard::ClientCard() {
atkstring[0] = 0; atkstring[0] = 0;
defstring[0] = 0; defstring[0] = 0;
lvstring[0] = 0; lvstring[0] = 0;
linkstring[0] = 0;
rkstring[0] = 0; rkstring[0] = 0;
rscstring[0] = 0; rscstring[0] = 0;
lscstring[0] = 0; lscstring[0] = 0;
...@@ -172,7 +173,7 @@ void ClientCard::UpdateInfo(char* buf) { ...@@ -172,7 +173,7 @@ void ClientCard::UpdateInfo(char* buf) {
pdata = BufferIO::ReadInt32(buf); pdata = BufferIO::ReadInt32(buf);
if (link != (unsigned int)pdata) { if (link != (unsigned int)pdata) {
link = pdata; link = pdata;
myswprintf(lvstring, L"L%d", link); myswprintf(linkstring, L"L%d", link);
} }
pdata = BufferIO::ReadInt32(buf); pdata = BufferIO::ReadInt32(buf);
if (link_marker != (unsigned int)pdata) { if (link_marker != (unsigned int)pdata) {
......
gframe/client_card.h
View file @ c54f2e09
...@@ -107,6 +107,7 @@ public: ...@@ -107,6 +107,7 @@ public:
wchar_t defstring[16]; wchar_t defstring[16];
wchar_t lvstring[16]; wchar_t lvstring[16];
wchar_t rkstring[16]; wchar_t rkstring[16];
wchar_t linkstring[16];
wchar_t lscstring[16]; wchar_t lscstring[16];
wchar_t rscstring[16]; wchar_t rscstring[16];
......
gframe/drawing.cpp
View file @ c54f2e09
...@@ -462,10 +462,10 @@ void Game::DrawMisc() { ...@@ -462,10 +462,10 @@ void Game::DrawMisc() {
} }
pcard = dField.mzone[1][5]; pcard = dField.mzone[1][5];
if(pcard && (pcard->position & POS_FACEUP)) if(pcard && (pcard->position & POS_FACEUP))
DrawStatus(pcard, 743, 338, 712, 291); DrawStatus(pcard, 739, 291, 710, 338);
pcard = dField.mzone[1][6]; pcard = dField.mzone[1][6];
if(pcard && (pcard->position & POS_FACEUP)) if(pcard && (pcard->position & POS_FACEUP))
DrawStatus(pcard, 589, 338, 563, 291); DrawStatus(pcard, 593, 291, 555, 338);
pcard = dField.szone[0][6]; pcard = dField.szone[0][6];
if(pcard) { if(pcard) {
adFont->draw(pcard->lscstring, mainGame->Resize(426, 394, 438, 414), 0xff000000, true, false, 0); adFont->draw(pcard->lscstring, mainGame->Resize(426, 394, 438, 414), 0xff000000, true, false, 0);
...@@ -559,8 +559,8 @@ void Game::DrawStatus(ClientCard* pcard, int x1, int y1, int x2, int y2) { ...@@ -559,8 +559,8 @@ void Game::DrawStatus(ClientCard* pcard, int x1, int y1, int x2, int y2) {
adFont->draw(pcard->lvstring, mainGame->Resize(x2 + 1, y2, x2 + 3, y2 + 21), (pcard->type & TYPE_TUNER) ? 0xffffff00 : 0xffffffff, false, false, 0); adFont->draw(pcard->lvstring, mainGame->Resize(x2 + 1, y2, x2 + 3, y2 + 21), (pcard->type & TYPE_TUNER) ? 0xffffff00 : 0xffffffff, false, false, 0);
} }
else if (pcard->link != 0) { else if (pcard->link != 0) {
adFont->draw(pcard->lvstring, mainGame->Resize(x2, y2, x2 + 2, y2 + 20), 0xff000000, false, false, 0); adFont->draw(pcard->linkstring, mainGame->Resize(x2, y2, x2 + 2, y2 + 20), 0xff000000, false, false, 0);
adFont->draw(pcard->lvstring, mainGame->Resize(x2 + 1, y2, x2 + 3, y2 + 21), 0xff99ffff, false, false, 0); adFont->draw(pcard->linkstring, mainGame->Resize(x2 + 1, y2, x2 + 3, y2 + 21), 0xff99ffff, false, false, 0);
} }
} }
void Game::DrawGUI() { void Game::DrawGUI() {
......
gframe/game.cpp
View file @ c54f2e09
...@@ -237,7 +237,7 @@ bool Game::Initialize() { ...@@ -237,7 +237,7 @@ bool Game::Initialize() {
btnDP->setEnabled(false); btnDP->setEnabled(false);
btnDP->setPressed(true); btnDP->setPressed(true);
btnDP->setVisible(false); btnDP->setVisible(false);
btnSP = env->addButton(rect<s32>(65, 0, 115, 20), wPhase, -1, L"\xff33\xff30"); btnSP = env->addButton(rect<s32>(0, 0, 50, 20), wPhase, -1, L"\xff33\xff30");
btnSP->setEnabled(false); btnSP->setEnabled(false);
btnSP->setPressed(true); btnSP->setPressed(true);
btnSP->setVisible(false); btnSP->setVisible(false);
...@@ -245,11 +245,11 @@ bool Game::Initialize() { ...@@ -245,11 +245,11 @@ bool Game::Initialize() {
btnM1->setEnabled(false); btnM1->setEnabled(false);
btnM1->setPressed(true); btnM1->setPressed(true);
btnM1->setVisible(false); btnM1->setVisible(false);
btnBP = env->addButton(rect<s32>(195, 0, 245, 20), wPhase, BUTTON_BP, L"\xff22\xff30"); btnBP = env->addButton(rect<s32>(160, 0, 210, 20), wPhase, BUTTON_BP, L"\xff22\xff30");
btnBP->setVisible(false); btnBP->setVisible(false);
btnM2 = env->addButton(rect<s32>(260, 0, 310, 20), wPhase, BUTTON_M2, L"\xff2d\xff12"); btnM2 = env->addButton(rect<s32>(160, 0, 210, 20), wPhase, BUTTON_M2, L"\xff2d\xff12");
btnM2->setVisible(false); btnM2->setVisible(false);
btnEP = env->addButton(rect<s32>(325, 0, 375, 20), wPhase, BUTTON_EP, L"\xff25\xff30"); btnEP = env->addButton(rect<s32>(320, 0, 370, 20), wPhase, BUTTON_EP, L"\xff25\xff30");
btnEP->setVisible(false); btnEP->setVisible(false);
btnShuffle = env->addButton(rect<s32>(0, 0, 50, 20), wPhase, BUTTON_CMD_SHUFFLE, dataManager.GetSysString(1307)); btnShuffle = env->addButton(rect<s32>(0, 0, 50, 20), wPhase, BUTTON_CMD_SHUFFLE, dataManager.GetSysString(1307));
btnShuffle->setVisible(false); btnShuffle->setVisible(false);
...@@ -1423,11 +1423,11 @@ void Game::OnResize() ...@@ -1423,11 +1423,11 @@ void Game::OnResize()
wPhase->setRelativePosition(Resize(480, 310, 855, 330)); wPhase->setRelativePosition(Resize(480, 310, 855, 330));
btnDP->setRelativePosition(Resize(0, 0, 50, 20)); btnDP->setRelativePosition(Resize(0, 0, 50, 20));
btnSP->setRelativePosition(Resize(65, 0, 115, 20)); btnSP->setRelativePosition(Resize(0, 0, 50, 20));
btnM1->setRelativePosition(Resize(130, 0, 180, 20)); btnM1->setRelativePosition(Resize(160, 0, 210, 20));
btnBP->setRelativePosition(Resize(195, 0, 245, 20)); btnBP->setRelativePosition(Resize(160, 0, 210, 20));
btnM2->setRelativePosition(Resize(260, 0, 310, 20)); btnM2->setRelativePosition(Resize(160, 0, 210, 20));
btnEP->setRelativePosition(Resize(325, 0, 375, 20)); btnEP->setRelativePosition(Resize(320, 0, 370, 20));
btnShuffle->setRelativePosition(Resize(0, 0, 50, 20)); btnShuffle->setRelativePosition(Resize(0, 0, 50, 20));
btnChainAlways->setRelativePosition(Resize(205, 140, 295, 175)); btnChainAlways->setRelativePosition(Resize(205, 140, 295, 175));
btnChainIgnore->setRelativePosition(Resize(205, 100, 295, 135)); btnChainIgnore->setRelativePosition(Resize(205, 100, 295, 135));
......
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