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

Jeck - Added custom booster packs (see miki), numerous small fixes. Once we hit feature-freeze I'll be reviewing this stuff in depth, as again there's likely a lot of room for cleaning... just wanted to get it in first :).

Browse Source 
I cut some bits out that weren't ready for SVN, hopefully I've committed everything correctly.
This commit is contained in:
wagic.jeck
2010-02-11 18:32:44 +00:00
parent 103a3d2822
commit ab34fc16f9
31 changed files with 1013 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
projects/mtg/src/WGui.cpp
View File

@@ -1105,8 +1105,13 @@ void WGuiCardImage::Render(){
if(!source || (c = source->getCard(mOffset.getPos())) == NULL){
JQuad * q;
if(bThumb)
if(bThumb){
q = resources.GetQuad("back_thumb");
#if defined WIN32 || defined LINUX
if(!q)
q = resources.GetQuad("back");
#endif
}
else
q = resources.GetQuad("back");
float scale = p.actZ * 257.f / q->mHeight;
@@ -1116,8 +1121,13 @@ void WGuiCardImage::Render(){
return;
if(bThumb){
JQuad * q = NULL;
if(!options[Options::DISABLECARDS].number)
if(!options[Options::DISABLECARDS].number){
q = source->getThumb(mOffset.getPos());
#if defined WIN32 || defined LINUX
if(!q)
q = source->getImage(mOffset.getPos());
#endif
}
if(!q && (q = CardGui::alternateThumbQuad(c)) == NULL)
return; //TODO Some kind of error image.
renderer->RenderQuad(q,p.x,p.y);
@@ -1153,8 +1163,13 @@ void WGuiCardDistort::Render(){
if(!source){
//Default to back.
if(bThumb)
if(bThumb){
q = resources.GetQuad("back_thumb");
#if defined WIN32 || defined LINUX
if(!q)
q = resources.GetQuad("back");
#endif
}
else
q = resources.GetQuad("back");
}else {
@@ -1164,6 +1179,10 @@ void WGuiCardDistort::Render(){
if(bThumb){
q = source->getThumb(mOffset.getPos());
#if defined WIN32 || defined LINUX
if(!q)
q = source->getImage(mOffset.getPos());
#endif
if(!q || options[Options::DISABLECARDS].number)
q = CardGui::alternateThumbQuad(c);
}