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

Jeck - Initialize player avatar to NULL, cleanup some minor debug leftovers. Still eventually crashes with corrupted MTGCardInstance reference.

Browse Source
This commit is contained in:
wagic.jeck
2009-09-03 20:10:59 +00:00
parent c6f319d685
commit 8ea9222122
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/CardGui.cpp
+1 -2
View File
@@ -105,7 +105,6 @@ JQuad * CardGui::alternateThumbQuad(MTGCard * card){
} }
if(q && q->mTex) if(q && q->mTex)
q->SetHotSpot(q->mTex->mWidth/2,q->mTex->mHeight/2); q->SetHotSpot(q->mTex->mWidth/2,q->mTex->mHeight/2);
else q = q;
return q; return q;
} }
@@ -128,7 +127,7 @@ void CardGui::alternateRender(MTGCard * card, const Pos& pos){
float scale = pos.actZ * 250 / q->mHeight; float scale = pos.actZ * 250 / q->mHeight;
q->SetColor(ARGB((int)pos.actA,255,255,255)); q->SetColor(ARGB((int)pos.actA,255,255,255));
renderer->RenderQuad(q, pos.actX, pos.actY, pos.actT, scale, scale); renderer->RenderQuad(q, pos.actX, pos.actY, pos.actT, scale, scale);
}else q = q; }
// Write the title // Write the title
JLBFont * font = resources.GetJLBFont("magic"); JLBFont * font = resources.GetJLBFont("magic");
float backup_scale = font->GetScale(); float backup_scale = font->GetScale();
projects/mtg/src/Player.cpp
+1
View File
@@ -13,6 +13,7 @@ Player::Player(MTGPlayerCards * deck, string file, string fileSmall) : Damageabl
manaPool = NEW ManaPool(this); manaPool = NEW ManaPool(this);
canPutLandsIntoPlay = 1; canPutLandsIntoPlay = 1;
mAvatar = NULL; mAvatar = NULL;
mAvatarTex = NULL;
type_as_damageable = DAMAGEABLE_PLAYER; type_as_damageable = DAMAGEABLE_PLAYER;
} }