Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #797 from kevlahnota/master

Browse Source 
Alpha-Beta Small-Inner Border
This commit is contained in:
Anthony Calosa
2016-07-27 18:13:11 +08:00
committed by GitHub
parent e9db853f28 068b03a0bb
commit 0e14226968
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
projects/mtg/bin/Res/graphics/alphabeta.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

5
projects/mtg/src/CardGui.cpp
View File

@@ -1125,6 +1125,7 @@ void CardGui::RenderBig(MTGCard* card, const Pos& pos, bool thumb, bool noborder
JQuadPtr quad = thumb ? WResourceManager::Instance()->RetrieveCard(card, RETRIEVE_THUMB) JQuadPtr quad = thumb ? WResourceManager::Instance()->RetrieveCard(card, RETRIEVE_THUMB)
: WResourceManager::Instance()->RetrieveCard(card); : WResourceManager::Instance()->RetrieveCard(card);
JQuadPtr alphabeta = WResourceManager::Instance()->RetrieveTempQuad("alphabeta.png");
MTGCardInstance * kcard = dynamic_cast<MTGCardInstance*>(card); MTGCardInstance * kcard = dynamic_cast<MTGCardInstance*>(card);
if(kcard && !kcard->isToken && kcard->name != kcard->model->data->name) if(kcard && !kcard->isToken && kcard->name != kcard->model->data->name)
{ {
@@ -1162,7 +1163,11 @@ void CardGui::RenderBig(MTGCard* card, const Pos& pos, bool thumb, bool noborder
} }
} }
if(cardsetname == "LEA"||cardsetname == "LEB") if(cardsetname == "LEA"||cardsetname == "LEB")
{
if(alphabeta.get())
renderer->RenderQuad(alphabeta.get(),(pos.actX - (pos.actZ * 100.f))+12.f,(pos.actY - (pos.actZ * 142.5f))+17.5f, pos.actT, 0.88f, 0.88f);
renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale-0.01f, scale-0.01f); renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale-0.01f, scale-0.01f);
}
else else
renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale, scale); renderer->RenderQuad(quad.get(), x, pos.actY, pos.actT, scale, scale);
} }