From f5693e0b6f3cf68115b02f9a9bc334e06c91d64c Mon Sep 17 00:00:00 2001
From: "wagic.the.homebrew"
 <wagic.the.homebrew@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Mon, 26 Jan 2009 13:04:58 +0000
Subject: [PATCH] Erwan - Added extra rendering for "text" mode

---
 projects/mtg/src/ActionStack.cpp | 13 +++++++------
 projects/mtg/src/CardGui.cpp     | 21 ++++++++++++---------
 projects/mtg/src/Damage.cpp      |  5 +++--
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/projects/mtg/src/ActionStack.cpp b/projects/mtg/src/ActionStack.cpp
index 4211be233..abdae48e6 100644
--- a/projects/mtg/src/ActionStack.cpp
+++ b/projects/mtg/src/ActionStack.cpp
@@ -54,7 +54,7 @@ void StackAbility::Render(){
     float scale = 30 / quad->mHeight;
     renderer->RenderQuad(quad, x  , y , 0,scale,scale);
   }else{
-    //TODO
+    mFont->DrawString(ability->source->getName(),x,y-15);
   }
 }
 StackAbility::StackAbility(int id,MTGAbility * _ability): Interruptible(id),ability(_ability){
@@ -105,9 +105,7 @@ void Spell::Render(){
   JLBFont * mFont = GameApp::CommonRes->GetJLBFont(Constants::MAIN_FONT);
   mFont->SetBase(0);
   mFont->SetScale(DEFAULT_MAIN_FONT_SCALE);
-  char buffer[200];
-  sprintf(buffer, "%s", source->getName());
-  mFont->DrawString(buffer, x + 20 , y, JGETEXT_LEFT);
+  mFont->DrawString(source->getName(), x + 25 , y, JGETEXT_LEFT);
   JRenderer * renderer = JRenderer::GetInstance();
   JQuad * quad = source->getThumb();
   if (quad){
@@ -115,7 +113,7 @@ void Spell::Render(){
     float scale = mHeight  / quad->mHeight;
     renderer->RenderQuad(quad, x  , y , 0,scale,scale);
   }else{
-    //TODO
+    //
   }
   Damageable * target = getNextDamageableTarget();
   if (target){
@@ -124,6 +122,9 @@ void Spell::Render(){
       quad->SetColor(ARGB(255,255,255,255));
       float scale = 30 / quad->mHeight;
       renderer->RenderQuad(quad, x + 150  , y , 0,scale,scale);
+    }else{
+      if (target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
+        mFont->DrawString(((MTGCardInstance *)target)->getName(),x+120,y);
     }
   }
 }
@@ -163,7 +164,7 @@ void PutInGraveyard::Render(){
     float scale = 30 / quad->mHeight;
     renderer->RenderQuad(quad, x  , y , 0,scale,scale);
   }else{
-    //TODO
+    mFont->DrawString(card->getName(),x,y-15);
   }
 }
 
diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp
index 3f232b04a..d8a9bff08 100644
--- a/projects/mtg/src/CardGui.cpp
+++ b/projects/mtg/src/CardGui.cpp
@@ -294,14 +294,17 @@ void CardGui::Render(){
     myW = quad->mWidth * mScale;
     myX = x + (quad->mHeight/2 * tap * mScale);
     myY = y+(quad->mWidth/2 * tap * mScale);
-    if (mHeight-defaultHeight){
-      if (card->isTapped()){
-	      renderer->FillRect(myX + 1*(mHeight-defaultHeight) - quad->mHeight * mScale , myY + 1*(mHeight-defaultHeight) , quad->mHeight * mScale, quad->mWidth * mScale,   ARGB(128,0,0,0));
-      }else{
-	      renderer->FillRect(myX + 1*(mHeight-defaultHeight)  , myY + 1*(mHeight-defaultHeight) , quad->mWidth * mScale,  quad->mHeight * mScale, ARGB(128,0,0,0));
-      }
-    }
+  }
 
+  if (mHeight-defaultHeight){
+    if (card->isTapped()){
+      renderer->FillRect(myX + 1*(mHeight-defaultHeight) - myH , myY + 1*(mHeight-defaultHeight) , myH, myW,   ARGB(128,0,0,0));
+    }else{
+      renderer->FillRect(myX + 1*(mHeight-defaultHeight)  , myY + 1*(mHeight-defaultHeight) , myW,  myH, ARGB(128,0,0,0));
+    }
+  }
+
+   if(quad){
     quad->SetColor(ARGB( alpha,255,255,255));
 
     if (tc){
@@ -342,7 +345,7 @@ void CardGui::Render(){
       if (mIcon) renderer->RenderQuad(mIcon,myX - myH/2, myY + myW/2,M_PI_2,mScale,mScale);
       if (tc){
         if (!tc->canTarget(card)){
-	        renderer->DrawRect(myX  - myH , myY  , myH, myW,   ARGB(128,0,0,0));
+	        renderer->FillRect(myX  - myH , myY  , myH, myW,   ARGB(200,0,0,0));
         }
       }
     }else{
@@ -353,7 +356,7 @@ void CardGui::Render(){
       if (mIcon) renderer->RenderQuad(mIcon,myX + myW/2, myY + myH/2,0,mScale, mScale);
       if (tc){
         if (!tc->canTarget(card)){
-	        renderer->DrawRect(myX   , myY , myW,  myH,   ARGB(128,0,0,0));
+	        renderer->FillRect(myX   , myY , myW,  myH,   ARGB(200,0,0,0));
         }
       }
     }
diff --git a/projects/mtg/src/Damage.cpp b/projects/mtg/src/Damage.cpp
index 2c053e703..34cf1df0b 100644
--- a/projects/mtg/src/Damage.cpp
+++ b/projects/mtg/src/Damage.cpp
@@ -60,14 +60,15 @@ void Damage::Render(){
     float scale = 30 / quad->mHeight;
     renderer->RenderQuad(quad, x  , y , 0,scale,scale);
   }else{
-    //TODO
+    mFont->DrawString(source->getName(),x,y-15);
   }
   quad = target->getIcon();
   if (quad){
     float scale = 30 / quad->mHeight;
     renderer->RenderQuad(quad, x + 150  , y , 0,scale,scale);
   }else{
-    //TODO
+    if (target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
+        mFont->DrawString(((MTGCardInstance *)target)->getName(),x+120,y);
   }
 
 }