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

Jeck - I somehow managed to break the test suite. Rolled back my changes to r843, won't commit until they're properly debugged.

Browse Source
This commit is contained in:
wagic.jeck
2009-09-15 01:53:02 +00:00
parent 1b468bde14
commit 505ee8d1eb
8 changed files with 81 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
projects/mtg/src/GuiCombat.cpp
View File

@@ -12,21 +12,25 @@ struct Left : public Exp { static inline bool test(DamagerDamaged* ref, DamagerD
struct Right : public Exp { static inline bool test(DamagerDamaged* ref, DamagerDamaged* test)
{ return ref->y == test->y && ref->x < test->x && test->show; } };
JTexture* GuiCombat::ok_tex = NULL;
JQuad* GuiCombat::ok_quad = NULL;
GuiCombat::GuiCombat(GameObserver* go) : GuiLayer(), go(go), active(false), activeAtk(NULL),
ok(SCREEN_WIDTH - MARGIN, 210, 1, 0, 255),
enemy_avatar(SCREEN_WIDTH - MARGIN, TOP_LINE, 2, 0, 255),
cursor_pos(NONE), step(DAMAGE)
{
if(NULL == ok_tex)
if(NULL == ok_quad)
{
ok_tex = resources.RetrieveTexture("OK.png");
ok_quad = resources.RetrieveQuad("OK.png");
if (ok_quad) ok_quad->SetHotSpot(28, 22);
}
}
GuiCombat::~GuiCombat()
{
if(ok_quad)
resources.Release(ok_quad);
for (inner_iterator it = attackers.begin(); it != attackers.end(); ++it)
{
for (vector<DefenserDamaged*>::iterator q = (*it)->blockers.begin(); q != (*it)->blockers.end(); ++q)
@@ -273,11 +277,7 @@ void GuiCombat::Render()
}
}
}
if (ok_tex) {
JQuad *ok_quad = resources.RetrieveTempQuad("ok.png");
ok_quad->SetHotSpot(28, 22);
ok.Render(ok_quad);
}
if (ok_quad) ok.Render(ok_quad);
renderer->DrawLine(0, SCREEN_HEIGHT / 2 + 10, SCREEN_WIDTH, SCREEN_HEIGHT / 2 + 10, ARGB(255, 255, 64, 0));
if (FIRST_STRIKE == step)
{