From 1b468bde14e6d073adc9fa1c3411d7c5ccb04577 Mon Sep 17 00:00:00 2001
From: "wagic.jeck" <wagic.jeck@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Mon, 14 Sep 2009 21:09:58 +0000
Subject: [PATCH] Jeck - Replaced ok_quad with ok_tex, which won't expire until
 the duel is over.

---
 projects/mtg/include/GuiCombat.h   |  2 +-
 projects/mtg/src/GameStateDuel.cpp |  2 ++
 projects/mtg/src/GuiCombat.cpp     | 16 ++++++++--------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/projects/mtg/include/GuiCombat.h b/projects/mtg/include/GuiCombat.h
index 3b45a1d64..227c66398 100644
--- a/projects/mtg/include/GuiCombat.h
+++ b/projects/mtg/include/GuiCombat.h
@@ -13,7 +13,7 @@ class GuiCombat : public GuiLayer
   GameObserver* go;
   DamagerDamaged* active;
   AttackerDamaged* activeAtk;
-  static JQuad* ok_quad;
+  static JTexture* ok_tex;
   Pos ok, enemy_avatar;
   vector<AttackerDamaged*> attackers;
   DamagerDamaged* current;
diff --git a/projects/mtg/src/GameStateDuel.cpp b/projects/mtg/src/GameStateDuel.cpp
index 72b2d64e0..70c06407d 100644
--- a/projects/mtg/src/GameStateDuel.cpp
+++ b/projects/mtg/src/GameStateDuel.cpp
@@ -73,6 +73,7 @@ void GameStateDuel::Start()
   testSuite = NEW TestSuite(RESPATH"/test/_tests.txt",mParent->collection);
 #endif
 
+  resources.RetrieveTexture("OK.png",RETRIEVE_LOCK);
 
   mGamePhase = DUEL_STATE_CHOOSE_DECK1;
   credits = NEW Credits();
@@ -218,6 +219,7 @@ void GameStateDuel::End()
 #if defined (WIN32) || defined (LINUX)
   OutputDebugString("Ending GamestateDuel\n");
 #endif
+  resources.Release(resources.RetrieveTexture("OK.png"));
   resources.SmallCache();
   SAFE_DELETE(deckmenu);
   JRenderer::GetInstance()->EnableVSync(false);
diff --git a/projects/mtg/src/GuiCombat.cpp b/projects/mtg/src/GuiCombat.cpp
index ac49fe1b3..9ef2b8a84 100644
--- a/projects/mtg/src/GuiCombat.cpp
+++ b/projects/mtg/src/GuiCombat.cpp
@@ -12,25 +12,21 @@ 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; } };
 
-JQuad* GuiCombat::ok_quad = NULL;
+JTexture* GuiCombat::ok_tex = 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_quad)
+    if(NULL == ok_tex)
     {
-      ok_quad = resources.RetrieveQuad("OK.png");
-      if (ok_quad) ok_quad->SetHotSpot(28, 22);
+      ok_tex = resources.RetrieveTexture("OK.png");
     }
 }
 
 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)
@@ -277,7 +273,11 @@ void GuiCombat::Render()
 	  }
 	}
     }
-  if (ok_quad) ok.Render(ok_quad);
+  if (ok_tex) {
+    JQuad *ok_quad = resources.RetrieveTempQuad("ok.png");
+    ok_quad->SetHotSpot(28, 22);
+    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)
     {