Merge pull request #754 from kevlahnota/master

support doubled res for awards
2016-07-16 19:50:20 +08:00
parent 886a26aa20 f0fa6986d7
commit 3d41531a84
9 changed files with 9 additions and 2 deletions
--- a/projects/mtg/bin/Res/graphics/awardback.jpg
+++ b/projects/mtg/bin/Res/graphics/awardback.jpg
--- a/projects/mtg/bin/Res/graphics/trophy.png
+++ b/projects/mtg/bin/Res/graphics/trophy.png
--- a/projects/mtg/bin/Res/graphics/trophy_prx_eviltwin.png
+++ b/projects/mtg/bin/Res/graphics/trophy_prx_eviltwin.png
--- a/projects/mtg/bin/Res/graphics/trophy_prx_handler.png
+++ b/projects/mtg/bin/Res/graphics/trophy_prx_handler.png
--- a/projects/mtg/bin/Res/graphics/trophy_prx_rimom.png
+++ b/projects/mtg/bin/Res/graphics/trophy_prx_rimom.png
--- a/projects/mtg/bin/Res/graphics/trophy_prx_rnddeck.png
+++ b/projects/mtg/bin/Res/graphics/trophy_prx_rnddeck.png
--- a/projects/mtg/bin/Res/graphics/trophy_set.png
+++ b/projects/mtg/bin/Res/graphics/trophy_set.png
--- a/projects/mtg/src/GameStateAwards.cpp
+++ b/projects/mtg/src/GameStateAwards.cpp
@@ -148,7 +148,7 @@ void GameStateAwards::Render()

    JQuadPtr background = WResourceManager::Instance()->RetrieveTempQuad("awardback.jpg", TEXTURE_SUB_5551);
    if (background.get())
-        r->RenderQuad(background.get(), 0, 0);
+        r->RenderQuad(background.get(), 0, 0, 0, SCREEN_WIDTH_F / background->mWidth, SCREEN_HEIGHT_F / background->mHeight);

    switch (mState)
    {
--- a/projects/mtg/src/WGui.cpp
+++ b/projects/mtg/src/WGui.cpp
@@ -1330,7 +1330,14 @@ void WGuiAward::Underlay()

    if (trophy.get())
    {
-        JRenderer::GetInstance()->RenderQuad(trophy.get(), 0, SCREEN_HEIGHT - trophy->mHeight);
+        trophy->SetHotSpot(0,trophy->mHeight);
+        if(trophy->mHeight == 268.f && trophy->mWidth == 203.f)
+        {
+            trophy->SetHotSpot(0,0);
+            JRenderer::GetInstance()->RenderQuad(trophy.get(), 0, SCREEN_HEIGHT-trophy->mHeight);
+        }
+        else
+            JRenderer::GetInstance()->RenderQuad(trophy.get(), 0, SCREEN_HEIGHT, 0, 171.f / trophy->mWidth, 192.f / trophy->mHeight);
    }

 }