Merge pull request #754 from kevlahnota/master
support doubled res for awards
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 122 KiB |
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 514 KiB |
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 514 KiB |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 514 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 514 KiB |
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 514 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 514 KiB |
@@ -148,7 +148,7 @@ void GameStateAwards::Render()
|
|||||||
|
|
||||||
JQuadPtr background = WResourceManager::Instance()->RetrieveTempQuad("awardback.jpg", TEXTURE_SUB_5551);
|
JQuadPtr background = WResourceManager::Instance()->RetrieveTempQuad("awardback.jpg", TEXTURE_SUB_5551);
|
||||||
if (background.get())
|
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)
|
switch (mState)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1330,7 +1330,14 @@ void WGuiAward::Underlay()
|
|||||||
|
|
||||||
if (trophy.get())
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||