From 08bf8781cc09070bc319b929a373c841d74586e6 Mon Sep 17 00:00:00 2001
From: "wagic.the.homebrew@gmail.com"
 <wagic.the.homebrew@gmail.com@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Tue, 29 Sep 2009 14:07:14 +0000
Subject: [PATCH] Erwan - fix issue 69 (Shadow.png load issue) - I put it back
 to a black 16x16 image. If you need more alpha, use the facilities provided
 by JGE rather than touching the file, thanks ;)

---
 projects/mtg/bin/Res/graphics/shadow.png | Bin 101 -> 146 bytes
 projects/mtg/include/CardSelector.h      |   2 +-
 projects/mtg/src/CardGui.cpp             |   9 ++++-----
 projects/mtg/src/CardSelector.cpp        |   2 +-
 projects/mtg/src/GameApp.cpp             |   4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/projects/mtg/bin/Res/graphics/shadow.png b/projects/mtg/bin/Res/graphics/shadow.png
index ae3e064cc27ec6caf94f2fe972b65bb9b18b98af..49ead4d4f87322a31025f8baa12373d9966a3501 100644
GIT binary patch
literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-MC9V-A
z!TD(=<%vb93;~Imc_n&&t|1C##(KsE4lV8=15`a-978PplT#8Be()a=VVuA?C85it
oIo7}P?P4~E$p<nN`qWeyn7uv-E@}UD8K{B5)78&qol`;+0Q4Ow!~g&Q

literal 101
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaOClDyqr82*Fc
sg1yTp14Vc}T^vI=t|uoXBzQ10Fk~~NA6m<+0hD0yboFyt=akR{03{?CRR910

diff --git a/projects/mtg/include/CardSelector.h b/projects/mtg/include/CardSelector.h
index ad357b479..2a94cd882 100644
--- a/projects/mtg/include/CardSelector.h
+++ b/projects/mtg/include/CardSelector.h
@@ -54,8 +54,8 @@ class ObjectSelector : public GuiLayer
  T* fetchMemory(SelectorMemory&);
 
  public:
- int bigMode;
  ObjectSelector(DuelLayers*);
+ int bigMode;
  void Add(T*);
  void Remove(T*);
  bool CheckUserInput(u32 key);
diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp
index 322a96a6f..8284da771 100644
--- a/projects/mtg/src/CardGui.cpp
+++ b/projects/mtg/src/CardGui.cpp
@@ -59,8 +59,8 @@ void CardGui::Render()
   float scale = actZ * cardScale;
 
   JQuad* shadow = resources.GetQuad("shadow");
-  shadow->SetColor(ARGB(static_cast<unsigned char>(actA),128,255,255));
-  renderer->RenderQuad(shadow, actX + (actZ-1)*15, actY + (actZ-1)*15, actT, 28*actZ, 40*actZ); 
+  shadow->SetColor(ARGB(static_cast<unsigned char>(actA)/2,255,255,255));
+  renderer->RenderQuad(shadow, actX + (actZ-1)*15, actY + (actZ-1)*15, actT, 28*actZ/16, 40*actZ/16); 
 
   if (quad) {
     quad->SetColor(ARGB(static_cast<unsigned char>(actA),255,255,255));
@@ -105,9 +105,8 @@ void CardGui::Render()
   }
 
   if (tc && !tc->canTarget(card)) {
-    shadow->SetColor(ARGB(static_cast<unsigned char>(actA),255,255,255));
-    renderer->RenderQuad(shadow, actX, actY, actT, 28*actZ + 1, 40*actZ);
-    renderer->RenderQuad(shadow, actX, actY, actT, 28*actZ + 1, 40*actZ); //Rendering it twice because shadow.png stupidly alreay has some transparency
+    shadow->SetColor(ARGB(200,255,255,255));
+    renderer->RenderQuad(shadow, actX, actY, actT, 28*actZ/16 + 1, 40*actZ/16);
   }
 
   PlayGuiObject::Render();
diff --git a/projects/mtg/src/CardSelector.cpp b/projects/mtg/src/CardSelector.cpp
index 48113d2ee..6caeba697 100644
--- a/projects/mtg/src/CardSelector.cpp
+++ b/projects/mtg/src/CardSelector.cpp
@@ -24,7 +24,7 @@ struct True : public Exp { static inline bool test(CardSelector::Target* ref, Ca
   { return true; } };
 
 template<>
-CardSelector::ObjectSelector(DuelLayers* duel) : active(NULL), bigMode(BIG_MODE_SHOW), duel(duel), limitor(NULL), bigpos(300, 150, 1.0, 0.0, 220) {}
+CardSelector::ObjectSelector(DuelLayers* duel) : active(NULL), duel(duel), limitor(NULL), bigpos(300, 150, 1.0, 0.0, 220), bigMode(BIG_MODE_SHOW) {}
 
 template<>
 void CardSelector::Add(CardSelector::Target* target)
diff --git a/projects/mtg/src/GameApp.cpp b/projects/mtg/src/GameApp.cpp
index bfdbc8575..5cb5ec3c1 100644
--- a/projects/mtg/src/GameApp.cpp
+++ b/projects/mtg/src/GameApp.cpp
@@ -137,8 +137,8 @@ void GameApp::Create()
   jq->SetHotSpot(12, 12);
   jq = resources.RetrieveQuad("DefenderIcon.png", 0, 0, 24, 23,"DefenderIcon",RETRIEVE_MANAGE);
   jq->SetHotSpot(12, 12);
-  jq = resources.RetrieveQuad("shadow.png", 0, 0, 1, 1,"shadow",RETRIEVE_MANAGE);
-  jq->SetHotSpot(0.5, 0.5);
+  jq = resources.RetrieveQuad("shadow.png", 0, 0, 16, 16,"shadow",RETRIEVE_MANAGE);
+  jq->SetHotSpot(8, 8);
   
   collection = NEW MTGAllCards();