From 49a6ee18fc2d862c6d4896c377fb0baefce08b89 Mon Sep 17 00:00:00 2001
From: "wagic.jeck" <wagic.jeck@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Wed, 17 Feb 2010 04:53:06 +0000
Subject: [PATCH] Jeck - "Trophy Room" button now uses generic image. I'm not
 certain I like the way this looks, but it's necessary for
 internationalization.

---
 ...{button_trophy.png => button_shoulder.png} | Bin 4659 -> 3359 bytes
 projects/mtg/src/GameStateMenu.cpp            |  16 ++++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
 rename projects/mtg/bin/Res/graphics/{button_trophy.png => button_shoulder.png} (57%)

diff --git a/projects/mtg/bin/Res/graphics/button_trophy.png b/projects/mtg/bin/Res/graphics/button_shoulder.png
similarity index 57%
rename from projects/mtg/bin/Res/graphics/button_trophy.png
rename to projects/mtg/bin/Res/graphics/button_shoulder.png
index 681903f63f43306537ba223d5ba127fec89a13d0..631fcbc3bf1691d7884382240da9ff9b8690fe5d 100644
GIT binary patch
delta 618
zcmV-w0+s!<B%d0P7YZN<1^@s6qMd$(u_3Mse*!v5L_t(|+U%G=h|^FU$3J;V+99Qb
zSndRIanQk`+btFR0|yR*gK#)1I6CQcAR@TAIe2jB=AfIP!Yy(Iu|+rvF5)0`Xgk=1
zLU|UFmgKp#wP|~IO&u<6^Mw#zcnQDX=l%W>O)14H%K)fUDueYFunnAzp{;*_UqA)e
ze*?Y(?r|@<u1gRE6VD5U!ao3g-3NAKd|0P|bHFv=5%3du2kZd9=l!VY-#3Am3l_Z>
zfhWNC{=r@P9{_j8qG6G=){ou;;C0mW9RSdlpq{0HdwmcOq5@c^R<H)V0Nw(pX9ci~
z+5$cT7mjN6%M1WuBb7?+o2I!Q1OcO0e`pSvMR6LKG;Q{hC4@L*n&x}Y^KJt6)IsPt
zr<GE%1~9&!V(W%s7;oC`_KhG2g3<lPVUCYGAIFh7N+cMDvFZE%V=3j+BLOI-hB-3s
zeB2;J0RWKAX1ANo=BHk-cMt*~gcufwQKzS+z)3?GbvmjorfH@u%X;2uG_HmKe@H2H
z%d#e%p9bTkHIE$wXi6#4>GT!bwyy)9hi$M}EVf&%)-VF%TmWYQG;Z@?Ev2Mhuj9Jz
z-B1KLj<ZuLm2T(r`SnaDgQjV*jevR6#&un4wHnoG72o&2gaGKe{=;#cTjg^3LoS!g
z>AD`O2XQQbQ2}_Khi%(*yWL$~RM%fkbOFOKzI8gC%TmgRN~!aUngWLvOij}eLhK76
zo`v?T`Y$oTiYoz-07w8N01^NRfCNASAOVm7SW*2Q07%nEi-6Toc>n+a07*qoM6N<$
Eg6$3&I{*Lx

delta 1928
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

diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp
index 8e16b19d0..d45010d4f 100644
--- a/projects/mtg/src/GameStateMenu.cpp
+++ b/projects/mtg/src/GameStateMenu.cpp
@@ -557,14 +557,22 @@ void GameStateMenu::Render()
     if(mBg)
       renderer->RenderQuad(mBg,SCREEN_WIDTH/2,50);
 
-    JQuad * jq = resources.RetrieveTempQuad("button_trophy.png");
+    JQuad * jq = resources.RetrieveTempQuad("button_shoulder.png");
     if(jq){
       int alp = 255;
       if(options.newAward())
-        alp = (int) (sin(timeIndex) * 255);
-
+        alp = (int)(sin(timeIndex) * 255);
+      float olds = mFont->GetScale();
+      mFont = resources.GetJLBFont(Constants::OPTION_FONT);
       jq->SetColor(ARGB(abs(alp),255,255,255));        
-      renderer->RenderQuad(jq, SCREEN_WIDTH-64, 0);
+      mFont->SetColor(ARGB(abs(alp),0,0,0)); 
+      string s = _("Trophy Room");;
+      mFont->SetScale(1.0f);
+      mFont->SetScale(50.0f/mFont->GetStringWidth(s.c_str()));
+      renderer->RenderQuad(jq, SCREEN_WIDTH-64, 2);
+      mFont->DrawString(s,SCREEN_WIDTH-10,9,JGETEXT_RIGHT);
+      mFont = resources.GetJLBFont(Constants::MENU_FONT); 
+      mFont->SetScale(olds);
     }
   }
   if (subMenuController){