diff --git a/projects/mtg/bin/Res/graphics/backdrop.jpg b/projects/mtg/bin/Res/graphics/backdrop.jpg index 993692b48..08aa69ee9 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/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt index dce17eaad..ad24a4935 100644 --- a/projects/mtg/bin/Res/sets/primitives/mtg.txt +++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt @@ -113237,7 +113237,7 @@ type=Sorcery [/card] [card] name=To Arms! -auto=lord(creature|myBattlefield) untap +auto=all(creature|myBattlefield) untap auto=draw:1 text=Untap all creatures you control. -- Draw a card. mana={1}{W} diff --git a/projects/mtg/src/GameApp.cpp b/projects/mtg/src/GameApp.cpp index e9d2196c1..86d06fdc6 100644 --- a/projects/mtg/src/GameApp.cpp +++ b/projects/mtg/src/GameApp.cpp @@ -232,6 +232,7 @@ void GameApp::Create() //WResourceManager::Instance()->RetrieveTexture("gold.png", RETRIEVE_MANAGE); //WResourceManager::Instance()->RetrieveTexture("goldglow.png", RETRIEVE_MANAGE); WResourceManager::Instance()->RetrieveTexture("backdrop.jpg", RETRIEVE_MANAGE); + WResourceManager::Instance()->RetrieveTexture("backdropframe.png", RETRIEVE_MANAGE); WResourceManager::Instance()->RetrieveTexture("handback.png", RETRIEVE_MANAGE); WResourceManager::Instance()->RetrieveTexture("shadows.png", RETRIEVE_MANAGE); diff --git a/projects/mtg/src/GuiBackground.cpp b/projects/mtg/src/GuiBackground.cpp index 70b2ced0f..280c8b4f9 100644 --- a/projects/mtg/src/GuiBackground.cpp +++ b/projects/mtg/src/GuiBackground.cpp @@ -6,6 +6,7 @@ #include "Rules.h" const std::string kBackdropFile = "backdrop.jpg"; +const std::string kBackdropFrameFile = "backdropframe.png"; GuiBackground::GuiBackground(GameObserver* observer) : GuiLayer(observer) @@ -20,6 +21,7 @@ void GuiBackground::Render() { JRenderer* renderer = JRenderer::GetInstance(); JQuadPtr quad; + JQuadPtr quadframe = WResourceManager::Instance()->RetrieveTempQuad(kBackdropFrameFile); if (observer && observer->mRules && observer->mRules->bg.size()) { quad = WResourceManager::Instance()->RetrieveTempQuad(observer->mRules->bg); @@ -32,4 +34,8 @@ void GuiBackground::Render() { renderer->RenderQuad(quad.get(), 0, 0, 0, SCREEN_WIDTH_F / quad->mWidth, SCREEN_HEIGHT_F / quad->mHeight); } + if (quadframe.get()) + { + renderer->RenderQuad(quadframe.get(), 0, 0, 0, SCREEN_WIDTH_F / quadframe->mWidth, SCREEN_HEIGHT_F / quadframe->mHeight); + } }