diff --git a/projects/mtg/bin/Res/graphics/backdrop.jpg b/projects/mtg/bin/Res/graphics/backdrop.jpg index c421d570d..ac5fbf9c3 100644 Binary files a/projects/mtg/bin/Res/graphics/backdrop.jpg and b/projects/mtg/bin/Res/graphics/backdrop.jpg differ diff --git a/projects/mtg/bin/Res/themes/Christmas/backdrop.jpg b/projects/mtg/bin/Res/themes/Christmas/backdrop.jpg index 96df925ad..269d2c2c3 100644 Binary files a/projects/mtg/bin/Res/themes/Christmas/backdrop.jpg and b/projects/mtg/bin/Res/themes/Christmas/backdrop.jpg differ diff --git a/projects/mtg/bin/Res/themes/Classic/backdrop.jpg b/projects/mtg/bin/Res/themes/Classic/backdrop.jpg index 228964878..648a6b086 100644 Binary files a/projects/mtg/bin/Res/themes/Classic/backdrop.jpg and b/projects/mtg/bin/Res/themes/Classic/backdrop.jpg differ diff --git a/projects/mtg/bin/Res/themes/Gemstones/backdrop_black.jpg b/projects/mtg/bin/Res/themes/Gemstones/backdrop_black.jpg index 35d77fa27..b3c01c72e 100644 Binary files a/projects/mtg/bin/Res/themes/Gemstones/backdrop_black.jpg and b/projects/mtg/bin/Res/themes/Gemstones/backdrop_black.jpg differ diff --git a/projects/mtg/bin/Res/themes/Gemstones/backdrop_blue.jpg b/projects/mtg/bin/Res/themes/Gemstones/backdrop_blue.jpg index 4ca776b0d..a8e129f0c 100644 Binary files a/projects/mtg/bin/Res/themes/Gemstones/backdrop_blue.jpg and b/projects/mtg/bin/Res/themes/Gemstones/backdrop_blue.jpg differ diff --git a/projects/mtg/bin/Res/themes/Gemstones/backdrop_green.jpg b/projects/mtg/bin/Res/themes/Gemstones/backdrop_green.jpg index f4ae6edca..663901da4 100644 Binary files a/projects/mtg/bin/Res/themes/Gemstones/backdrop_green.jpg and b/projects/mtg/bin/Res/themes/Gemstones/backdrop_green.jpg differ diff --git a/projects/mtg/bin/Res/themes/Gemstones/backdrop_red.jpg b/projects/mtg/bin/Res/themes/Gemstones/backdrop_red.jpg index f79bd5bc9..52d3d66c3 100644 Binary files a/projects/mtg/bin/Res/themes/Gemstones/backdrop_red.jpg and b/projects/mtg/bin/Res/themes/Gemstones/backdrop_red.jpg differ diff --git a/projects/mtg/bin/Res/themes/Gemstones/backdrop_white.jpg b/projects/mtg/bin/Res/themes/Gemstones/backdrop_white.jpg index 04c5588ea..3ec0453b6 100644 Binary files a/projects/mtg/bin/Res/themes/Gemstones/backdrop_white.jpg and b/projects/mtg/bin/Res/themes/Gemstones/backdrop_white.jpg differ diff --git a/projects/mtg/bin/Res/themes/Green/backdrop.jpg b/projects/mtg/bin/Res/themes/Green/backdrop.jpg index b2c8b8dc0..427da7540 100644 Binary files a/projects/mtg/bin/Res/themes/Green/backdrop.jpg and b/projects/mtg/bin/Res/themes/Green/backdrop.jpg differ diff --git a/projects/mtg/bin/Res/themes/White Shrine/backdrop.JPG b/projects/mtg/bin/Res/themes/White Shrine/backdrop.JPG index b881729aa..aa16211a2 100644 Binary files a/projects/mtg/bin/Res/themes/White Shrine/backdrop.JPG and b/projects/mtg/bin/Res/themes/White Shrine/backdrop.JPG differ diff --git a/projects/mtg/src/ActionStack.cpp b/projects/mtg/src/ActionStack.cpp index 7093c2271..8d5664f2f 100644 --- a/projects/mtg/src/ActionStack.cpp +++ b/projects/mtg/src/ActionStack.cpp @@ -1220,11 +1220,11 @@ void ActionStack::Render() JRenderer * renderer = JRenderer::GetInstance(); //stack shadow - renderer->FillRoundRect(x0 - 7, y0+2, width + 17, height + 2, 9.0f, ARGB(128,0,0,0)); + //renderer->FillRoundRect(x0 - 7, y0+2, width + 17, height + 2, 9.0f, ARGB(128,0,0,0)); //stack fill - renderer->FillRoundRect(x0 - 7, y0+2, width + 17, height + 2, 9.0f, ARGB(200,10,10,10)); + renderer->FillRect(x0 - 7, y0+2, width + 17, height + 2, ARGB(245,10,10,10)); //stack border - renderer->DrawRoundRect(x0 - 7, y0+2, width + 17, height + 2, 9.0f, ARGB(160,240,240,240)); + renderer->DrawRect(x0 - 7, y0+2, width + 17, height + 2, ARGB(160,240,240,240)); std::ostringstream stream; // WALDORF - changed "interrupt ?" to "Interrupt?". Don't display count down diff --git a/projects/mtg/src/GuiBackground.cpp b/projects/mtg/src/GuiBackground.cpp index 20bd3fdfa..fba1877d6 100644 --- a/projects/mtg/src/GuiBackground.cpp +++ b/projects/mtg/src/GuiBackground.cpp @@ -31,7 +31,7 @@ void GuiBackground::Render() if (quad.get()) { quad->mWidth = 480.f; - quad->mHeight = 255.f; - renderer->RenderQuad(quad.get(), 0, 18); + quad->mHeight = 272.f; + renderer->RenderQuad(quad.get(), 0, 0); } } diff --git a/projects/mtg/src/GuiFrame.cpp b/projects/mtg/src/GuiFrame.cpp index 39d1ac33a..89f49b64f 100644 --- a/projects/mtg/src/GuiFrame.cpp +++ b/projects/mtg/src/GuiFrame.cpp @@ -6,9 +6,9 @@ GuiFrame::GuiFrame(GameObserver* observer) : GuiLayer(observer) { - if (observer->getResourceManager()) - { - if (observer->getResourceManager()->GetTexture("wood.png")) + //if (observer->getResourceManager()) + //{ + /*if (observer->getResourceManager()->GetTexture("wood.png")) { wood = observer->getResourceManager()->RetrieveQuad("wood.png", 0, 0, 0, 0); wood->mHeight = 32.f; @@ -17,9 +17,9 @@ GuiFrame::GuiFrame(GameObserver* observer) else { GameApp::systemError += "Can't load wood texture : " __FILE__ "\n"; - } + }*/ - if (observer->getResourceManager()->GetTexture("gold.png")) + /*if (observer->getResourceManager()->GetTexture("gold.png")) { gold1 = observer->getResourceManager()->RetrieveQuad("gold.png", 0, 0, SCREEN_WIDTH, 6, "gold1"); gold2 = observer->getResourceManager()->RetrieveQuad("gold.png", 0, 6, SCREEN_WIDTH, 6, "gold2"); @@ -30,9 +30,9 @@ GuiFrame::GuiFrame(GameObserver* observer) gold2->SetColor(ARGB(127, 255, 255, 255)); gold2->SetHFlip(true); } - } - } - step = 0.0; + }*/ + //} + //step = 0.0; } @@ -42,12 +42,12 @@ GuiFrame::~GuiFrame() void GuiFrame::Render() { - JRenderer* renderer = JRenderer::GetInstance(); + /*JRenderer* renderer = JRenderer::GetInstance(); float sized = step / 4; if (sized > SCREEN_WIDTH) sized -= SCREEN_WIDTH; - renderer->RenderQuad(wood.get(), 0, 0); - if (gold1.get()) + renderer->RenderQuad(wood.get(), 0, 0);*/ + /*if (gold1.get()) { renderer->RenderQuad(gold1.get(), -sized, 16); renderer->RenderQuad(gold1.get(), -sized + 479, 16); @@ -64,12 +64,12 @@ void GuiFrame::Render() renderer->RenderQuad(gold2.get(), step / 2, 16); renderer->RenderQuad(gold2.get(), step / 2 - 479, 16); } - } + }*/ } void GuiFrame::Update(float dt) { - step += dt * 5; + /*step += dt * 5; if (step > 2 * SCREEN_WIDTH) - step -= 2 * SCREEN_WIDTH; + step -= 2 * SCREEN_WIDTH;*/ } diff --git a/projects/mtg/src/GuiPhaseBar.cpp b/projects/mtg/src/GuiPhaseBar.cpp index ffb541c3f..87e73ca81 100644 --- a/projects/mtg/src/GuiPhaseBar.cpp +++ b/projects/mtg/src/GuiPhaseBar.cpp @@ -24,7 +24,7 @@ }; */ -const float GuiPhaseBar::zoom_big = (float)(1.5 * 1.4); +const float GuiPhaseBar::zoom_big = (float)(1.5 * 1.2); const float GuiPhaseBar::zoom_small = 1.5; const float GuiPhaseBar::step = M_PI/6.0f; diff --git a/projects/mtg/src/GuiPlay.cpp b/projects/mtg/src/GuiPlay.cpp index d9ebce42f..97076821a 100644 --- a/projects/mtg/src/GuiPlay.cpp +++ b/projects/mtg/src/GuiPlay.cpp @@ -160,10 +160,10 @@ void GuiPlay::BattleField::Update(float dt) void GuiPlay::BattleField::Render() { if (height > 3) - JRenderer::GetInstance()->FillRect(0, SCREEN_HEIGHT / 2 + 10 - height / 2, 480, height, ARGB(127, red, 0, 0)); - //JQuadPtr fillblack = WResourceManager::Instance()->RetrieveTempQuad("fillblack.png", TEXTURE_SUB_5551); - //if (fillblack.get() && height > 3)//mask - //JRenderer::GetInstance()->RenderQuad(fillblack.get(), 0, 70.f, 0, 0.5f, 0.5f); + { + JRenderer::GetInstance()->FillRect(0, SCREEN_HEIGHT / 2 + 8.5f - height / 2, 480, height, ARGB(127, red, 0, 0)); + JRenderer::GetInstance()->DrawRect(0, SCREEN_HEIGHT / 2 + 8.5f - height / 2, 480, height, ARGB(255, 255, 165, 0)); + } } GuiPlay::GuiPlay(DuelLayers* view) :