Style formatting.

This commit is contained in:
wrenczes@gmail.com
2011-04-25 05:28:53 +00:00
parent 56ab3ac5cf
commit 0b1808a989
+23 -22
View File
@@ -1,7 +1,7 @@
/*
* CardGui.cpp
* This class is in charge of rendering Cards on the screen
*/
* CardGui.cpp
* This class is in charge of rendering Cards on the screen
*/
#include "PrecompiledHeader.h"
@@ -47,12 +47,12 @@ namespace
}
}
CardGui::CardGui(MTGCardInstance* card, float x, float y) :
PlayGuiObject(Height, x, y, false), card(card)
CardGui::CardGui(MTGCardInstance* card, float x, float y)
: PlayGuiObject(Height, x, y, false), card(card)
{
}
CardGui::CardGui(MTGCardInstance* card, const Pos& ref) :
PlayGuiObject(Height, ref, false), card(card)
CardGui::CardGui(MTGCardInstance* card, const Pos& ref)
: PlayGuiObject(Height, ref, false), card(card)
{
}
@@ -73,8 +73,8 @@ float CardView::GetCenterY()
}
CardView::CardView(const SelectorZone owner, MTGCardInstance* card, float x, float y) :
CardGui(card, x, y), owner(owner)
CardView::CardView(const SelectorZone owner, MTGCardInstance* card, float x, float y)
: CardGui(card, x, y), owner(owner)
{
const Pos* ref = card->view;
while (card)
@@ -85,8 +85,8 @@ CardView::CardView(const SelectorZone owner, MTGCardInstance* card, float x, flo
}
}
CardView::CardView(const SelectorZone owner, MTGCardInstance* card, const Pos& ref) :
CardGui(card, ref), owner(owner)
CardView::CardView(const SelectorZone owner, MTGCardInstance* card, const Pos& ref)
: CardGui(card, ref), owner(owner)
{
const Pos* r = card->view;
while (card)
@@ -483,15 +483,15 @@ void CardGui::AlternateRender(MTGCard * card, const Pos& pos)
s += _(Subtypes::subtypesList->find(card->data->types[0]));
else
{
DebugTrace ("Typeless card: " << setlist[card->setId].c_str() << card->data->getName() << card->getId());
DebugTrace("Typeless card: " << setlist[card->setId].c_str() << card->data->getName() << card->getId());
}
font->DrawString(s.c_str(), x + (22 - BigWidth / 2)*pos.actZ, pos.actY + (49 - BigHeight / 2)*pos.actZ);
}
}
//expansion and rarity
font->SetColor(ARGB((int)pos.actA, 0, 0, 0));
{
//expansion and rarity
font->SetColor(ARGB((int)pos.actA, 0, 0, 0));
{
char buf[512];
switch(card->getRarity())
{
@@ -533,9 +533,9 @@ font->SetColor(ARGB((int)pos.actA, 0, 0, 0));
break; //Leave black
}
}
}
font->SetScale(backup_scale);
font->SetScale(backup_scale);
}
void CardGui::TinyCropRender(MTGCard * card, const Pos& pos, JQuad * quad)
@@ -846,12 +846,13 @@ MTGCardInstance* CardView::getCard()
return card;
}
TransientCardView::TransientCardView(MTGCardInstance* card, float x, float y) :
CardGui(card, x, y)
TransientCardView::TransientCardView(MTGCardInstance* card, float x, float y)
: CardGui(card, x, y)
{
}
TransientCardView::TransientCardView(MTGCardInstance* card, const Pos& ref) :
CardGui(card, ref)
TransientCardView::TransientCardView(MTGCardInstance* card, const Pos& ref)
: CardGui(card, ref)
{
}
;