Skip to content

Y
YGOMobile
Commit b550d68c authored by Dark Zane's avatar Dark Zane Committed by GitHub
Browse files
Options

Merge branch 'fallenstardust:master' into master

parents 501389de 033e0a51
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 1709 deletions
Classes/gframe/CAnimatedMeshHalfLife.cpp deleted 100644 → 0
View file @ 501389de
This diff is collapsed.
Classes/gframe/client_field.cpp
View file @ b550d68c
...@@ -499,14 +499,14 @@ void ClientField::ShowSelectCard(bool buttonok, bool chain) { ...@@ -499,14 +499,14 @@ void ClientField::ShowSelectCard(bool buttonok, bool chain) {
mainGame->stCardPos[i]->setBackgroundColor(0xff56649f); mainGame->stCardPos[i]->setBackgroundColor(0xff56649f);
else if(selectable_cards[i]->location == LOCATION_OVERLAY) { else if(selectable_cards[i]->location == LOCATION_OVERLAY) {
if(selectable_cards[i]->owner != selectable_cards[i]->overlayTarget->controler) if(selectable_cards[i]->owner != selectable_cards[i]->overlayTarget->controler)
mainGame->stCardPos[i]->setOverrideColor(0xfff0f8ff); mainGame->stCardPos[i]->setOverrideColor(0xff000099);
if(selectable_cards[i]->overlayTarget->controler) if(selectable_cards[i]->overlayTarget->controler)
mainGame->stCardPos[i]->setBackgroundColor(0xff5a5a5a); mainGame->stCardPos[i]->setBackgroundColor(0xff5a5a5a);
else else
mainGame->stCardPos[i]->setBackgroundColor(0xff56649f); mainGame->stCardPos[i]->setBackgroundColor(0xff56649f);
} else if(selectable_cards[i]->location == LOCATION_DECK || selectable_cards[i]->location == LOCATION_EXTRA || selectable_cards[i]->location == LOCATION_REMOVED) { } else if(selectable_cards[i]->location == LOCATION_DECK || selectable_cards[i]->location == LOCATION_EXTRA || selectable_cards[i]->location == LOCATION_REMOVED) {
if(selectable_cards[i]->position & POS_FACEDOWN) if(selectable_cards[i]->position & POS_FACEDOWN)
mainGame->stCardPos[i]->setOverrideColor(0xfff0f8ff); mainGame->stCardPos[i]->setOverrideColor(0xff000099);
if(selectable_cards[i]->controler) if(selectable_cards[i]->controler)
mainGame->stCardPos[i]->setBackgroundColor(0xff5a5a5a); mainGame->stCardPos[i]->setBackgroundColor(0xff5a5a5a);
else else
...@@ -630,14 +630,14 @@ void ClientField::ShowLocationCard() { ...@@ -630,14 +630,14 @@ void ClientField::ShowLocationCard() {
mainGame->stDisplayPos[i]->setText(formatBuffer); mainGame->stDisplayPos[i]->setText(formatBuffer);
if(display_cards[i]->location == LOCATION_OVERLAY) { if(display_cards[i]->location == LOCATION_OVERLAY) {
if(display_cards[i]->owner != display_cards[i]->overlayTarget->controler) if(display_cards[i]->owner != display_cards[i]->overlayTarget->controler)
mainGame->stDisplayPos[i]->setOverrideColor(0xfff0f8ff); mainGame->stDisplayPos[i]->setOverrideColor(0xff000099);
if(display_cards[i]->overlayTarget->controler) if(display_cards[i]->overlayTarget->controler)
mainGame->stDisplayPos[i]->setBackgroundColor(0xff5a5a5a); mainGame->stDisplayPos[i]->setBackgroundColor(0xff5a5a5a);
else else
mainGame->stDisplayPos[i]->setBackgroundColor(0xff56649f); mainGame->stDisplayPos[i]->setBackgroundColor(0xff56649f);
} else if(display_cards[i]->location == LOCATION_EXTRA || display_cards[i]->location == LOCATION_REMOVED) { } else if(display_cards[i]->location == LOCATION_EXTRA || display_cards[i]->location == LOCATION_REMOVED) {
if(display_cards[i]->position & POS_FACEDOWN) if(display_cards[i]->position & POS_FACEDOWN)
mainGame->stDisplayPos[i]->setOverrideColor(0xfff0f8ff); mainGame->stDisplayPos[i]->setOverrideColor(0xff000099);
if(display_cards[i]->controler) if(display_cards[i]->controler)
mainGame->stDisplayPos[i]->setBackgroundColor(0xff5a5a5a); mainGame->stDisplayPos[i]->setBackgroundColor(0xff5a5a5a);
else else
...@@ -698,10 +698,10 @@ void ClientField::ShowSelectOption(int select_hint) { ...@@ -698,10 +698,10 @@ void ClientField::ShowSelectOption(int select_hint) {
int newheight = 50 + 60 * (scrollbar ? 5 : count) * mainGame->yScale; int newheight = 50 + 60 * (scrollbar ? 5 : count) * mainGame->yScale;
int oldheight = pos.LowerRightCorner.Y - pos.UpperLeftCorner.Y; int oldheight = pos.LowerRightCorner.Y - pos.UpperLeftCorner.Y;
pos.UpperLeftCorner.Y = pos.UpperLeftCorner.Y + (oldheight - newheight) / 2; pos.UpperLeftCorner.Y = pos.UpperLeftCorner.Y + (oldheight - newheight) / 2;
pos.LowerRightCorner.X = pos.UpperLeftCorner.X + (scrollbar ? 405 : 390) * mainGame->xScale; pos.LowerRightCorner.X = pos.UpperLeftCorner.X + (scrollbar ? 425 : 390) * mainGame->xScale;
pos.LowerRightCorner.Y = pos.UpperLeftCorner.Y + newheight; pos.LowerRightCorner.Y = pos.UpperLeftCorner.Y + newheight;
mainGame->wOptions->setRelativePosition(pos); mainGame->wOptions->setRelativePosition(pos);
mainGame->bgOptions->setRelativePosition(rect<s32>(0, 0, (scrollbar ? 405 : 390) * mainGame->xScale, pos.LowerRightCorner.Y - pos.UpperLeftCorner.Y)); mainGame->bgOptions->setRelativePosition(rect<s32>(0, 0, (scrollbar ? 425 : 390) * mainGame->xScale, pos.LowerRightCorner.Y - pos.UpperLeftCorner.Y));
} else { } else {
mainGame->SetStaticText(mainGame->stOptions, 350 * mainGame->xScale, mainGame->guiFont, dataManager.GetDesc(select_options[0])); mainGame->SetStaticText(mainGame->stOptions, 350 * mainGame->xScale, mainGame->guiFont, dataManager.GetDesc(select_options[0]));
mainGame->stOptions->setVisible(true); mainGame->stOptions->setVisible(true);
......
Classes/gframe/event_handler.cpp
View file @ b550d68c
...@@ -1008,7 +1008,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1008,7 +1008,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->stCardPos[i]->setBackgroundColor(0xff56649f); mainGame->stCardPos[i]->setBackgroundColor(0xff56649f);
else if(selectable_cards[i + pos]->location == LOCATION_OVERLAY) { else if(selectable_cards[i + pos]->location == LOCATION_OVERLAY) {
if(selectable_cards[i + pos]->owner != selectable_cards[i + pos]->overlayTarget->controler) if(selectable_cards[i + pos]->owner != selectable_cards[i + pos]->overlayTarget->controler)
mainGame->stCardPos[i]->setOverrideColor(0xfff0f8ff); mainGame->stCardPos[i]->setOverrideColor(0xff000099);
if(selectable_cards[i + pos]->is_selected) if(selectable_cards[i + pos]->is_selected)
mainGame->stCardPos[i]->setBackgroundColor(0x6011113d); mainGame->stCardPos[i]->setBackgroundColor(0x6011113d);
else if(selectable_cards[i + pos]->overlayTarget->controler) else if(selectable_cards[i + pos]->overlayTarget->controler)
...@@ -1017,7 +1017,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1017,7 +1017,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->stCardPos[i]->setBackgroundColor(0xff56649f); mainGame->stCardPos[i]->setBackgroundColor(0xff56649f);
} else if(selectable_cards[i + pos]->location == LOCATION_DECK || selectable_cards[i + pos]->location == LOCATION_EXTRA || selectable_cards[i + pos]->location == LOCATION_REMOVED) { } else if(selectable_cards[i + pos]->location == LOCATION_DECK || selectable_cards[i + pos]->location == LOCATION_EXTRA || selectable_cards[i + pos]->location == LOCATION_REMOVED) {
if(selectable_cards[i + pos]->position & POS_FACEDOWN) if(selectable_cards[i + pos]->position & POS_FACEDOWN)
mainGame->stCardPos[i]->setOverrideColor(0xfff0f8ff); mainGame->stCardPos[i]->setOverrideColor(0xff000099);
if(selectable_cards[i + pos]->is_selected) if(selectable_cards[i + pos]->is_selected)
mainGame->stCardPos[i]->setBackgroundColor(0x6011113d); mainGame->stCardPos[i]->setBackgroundColor(0x6011113d);
else if(selectable_cards[i + pos]->controler) else if(selectable_cards[i + pos]->controler)
...@@ -1056,7 +1056,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1056,7 +1056,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->stDisplayPos[i]->setText(formatBuffer); mainGame->stDisplayPos[i]->setText(formatBuffer);
if(display_cards[i + pos]->location == LOCATION_OVERLAY) { if(display_cards[i + pos]->location == LOCATION_OVERLAY) {
if(display_cards[i + pos]->owner != display_cards[i + pos]->overlayTarget->controler) if(display_cards[i + pos]->owner != display_cards[i + pos]->overlayTarget->controler)
mainGame->stDisplayPos[i]->setOverrideColor(0xfff0f8ff); mainGame->stDisplayPos[i]->setOverrideColor(0xff000099);
// BackgroundColor: controller of the xyz monster // BackgroundColor: controller of the xyz monster
if(display_cards[i + pos]->overlayTarget->controler) if(display_cards[i + pos]->overlayTarget->controler)
mainGame->stDisplayPos[i]->setBackgroundColor(0xff5a5a5a); mainGame->stDisplayPos[i]->setBackgroundColor(0xff5a5a5a);
...@@ -1064,7 +1064,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1064,7 +1064,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->stDisplayPos[i]->setBackgroundColor(0xff56649f); mainGame->stDisplayPos[i]->setBackgroundColor(0xff56649f);
} else if(display_cards[i + pos]->location == LOCATION_EXTRA || display_cards[i + pos]->location == LOCATION_REMOVED) { } else if(display_cards[i + pos]->location == LOCATION_EXTRA || display_cards[i + pos]->location == LOCATION_REMOVED) {
if(display_cards[i + pos]->position & POS_FACEDOWN) if(display_cards[i + pos]->position & POS_FACEDOWN)
mainGame->stDisplayPos[i]->setOverrideColor(0xfff0f8ff); mainGame->stDisplayPos[i]->setOverrideColor(0xff000099);
if(display_cards[i + pos]->controler) if(display_cards[i + pos]->controler)
mainGame->stDisplayPos[i]->setBackgroundColor(0xff5a5a5a); mainGame->stDisplayPos[i]->setBackgroundColor(0xff5a5a5a);
else else
......
Classes/gframe/game.cpp
View file @ b550d68c
...@@ -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) {
btnSurrenderNo = env->addButton(Resize(200, 120, 310, 170), wSurrender, BUTTON_SURRENDER_NO, dataManager.GetSysString(1214)); btnSurrenderNo = env->addButton(Resize(200, 120, 310, 170), wSurrender, BUTTON_SURRENDER_NO, dataManager.GetSysString(1214));
ChangeToIGUIImageButton(btnSurrenderNo, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnSurrenderNo, imageManager.tButton_S, imageManager.tButton_S_pressed);
//options (350) //options (350)
wOptions = env->addWindow(Resize(470, 180, 860, 360), false, L""); wOptions = env->addWindow(Resize(470, 180, 860, 390), false, L"");
wOptions->getCloseButton()->setVisible(false); wOptions->getCloseButton()->setVisible(false);
wOptions->setVisible(false); wOptions->setVisible(false);
wOptions->setDrawBackground(false); wOptions->setDrawBackground(false);
...@@ -753,12 +753,12 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -753,12 +753,12 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
btnOption[i] = env->addButton(Resize(20, 20 + 60 * i, 370, 70 + 60 * i), wOptions, BUTTON_OPTION_0 + i, L""); btnOption[i] = env->addButton(Resize(20, 20 + 60 * i, 370, 70 + 60 * i), wOptions, BUTTON_OPTION_0 + i, L"");
ChangeToIGUIImageButton(btnOption[i], imageManager.tButton_L, imageManager.tButton_L_pressed); ChangeToIGUIImageButton(btnOption[i], imageManager.tButton_L, imageManager.tButton_L_pressed);
} }
scrOption = env->addScrollBar(false, Resize(0, 0, 0, 0), wOptions, SCROLL_OPTION_SELECT); scrOption = env->addScrollBar(false, Resize(380, 20, 410, 310), wOptions, SCROLL_OPTION_SELECT);
scrOption->setLargeStep(1); scrOption->setLargeStep(1);
scrOption->setSmallStep(1); scrOption->setSmallStep(1);
scrOption->setMin(0); scrOption->setMin(0);
#endif #endif
//pos //pos select
wPosSelect = env->addWindow(recti(660 * xScale - 223 * yScale, 160 * yScale, 660 * xScale + 223 * yScale, (160 + 228) * yScale), false, dataManager.GetSysString(561)); wPosSelect = env->addWindow(recti(660 * xScale - 223 * yScale, 160 * yScale, 660 * xScale + 223 * yScale, (160 + 228) * yScale), false, dataManager.GetSysString(561));
wPosSelect->getCloseButton()->setVisible(false); wPosSelect->getCloseButton()->setVisible(false);
wPosSelect->setVisible(false); wPosSelect->setVisible(false);
...@@ -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) {
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"", Resize_Y(20, 10, 660 * yScale, 40 * yScale), false, false, wCardDisplay, -1, false); stCardDisplay = env->addStaticText(L"", Resize_Y(20, 10, 660, 40), 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) {
stDisplayPos[i] = env->addStaticText(L"", Resize_Y(30 + 125 * i, 40, 150 + 125 * i, 60), true, false, wCardDisplay, -1, true); stDisplayPos[i] = env->addStaticText(L"", Resize_Y(30 + 125 * i, 40, 150 + 125 * i, 60), true, false, wCardDisplay, -1, true);
......
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