Merge pull request #1 from WagicProject/master

Merged from WagicProject:master

projects/mtg/src/AIPlayer.cpp

@@ -16,8 +16,6 @@
 
 int AIPlayer::totalAIDecks = -1;
 
-const char * const MTG_LAND_TEXTS[] = { "artifact", "forest", "island", "mountain", "swamp", "plains", "other lands" };
-
 AIAction::AIAction(AIPlayer * owner, MTGCardInstance * c, MTGCardInstance * t)
     : owner(owner), ability(NULL), player(NULL), click(c), target(t)
 {

projects/mtg/src/DeckMenu.cpp

@@ -21,13 +21,10 @@ namespace DeckMenuConst
     const float kDescriptionVerticalBoxPadding = -5;
     const float kDescriptionHorizontalBoxPadding = 5;
 	
-    const float kDefaultFontScale = 1.0f;
     const float kVerticalScrollSpeed = 7.0f;
 
     const int DETAILED_INFO_THRESHOLD = 20;
     const int kDetailedInfoButtonId = 10000;
-
-    const PIXEL_TYPE kRedColor = ARGB(0xFF, 0xFF, 0x00, 0x00);
 }
 
 hgeParticleSystem* DeckMenu::stars = NULL;

projects/mtg/src/GameStateDuel.cpp

@@ -28,9 +28,6 @@
 #include <time.h>
 #endif
 
-const float MENU_FONT_SCALE = 1.0f;
-
-
 enum ENUM_DUEL_STATE
 {
     DUEL_STATE_UNSET = 0,

projects/mtg/src/SimplePad.cpp

@@ -355,10 +355,9 @@ void SimplePad::Render()
     //This could use some cleaning up to make margins more explicit
     WFont * mFont = WResourceManager::Instance()->GetWFont(Fonts::MENU_FONT);
 
-    float offX = 0, offY = 0;
+    float offY = 0;
     float kH = mFont->GetHeight();
     float hSpacing = mFont->GetStringWidth("W");
-    float rowLen = mFont->GetStringWidth("JKLMNOPQR") + 14 * 7;
     float vSpacing = 0;
     float kW = hSpacing;
 
@@ -401,7 +400,9 @@ void SimplePad::Render()
 
     if (!bShowNumpad) vSpacing -= kH + 12;
 #ifndef IOS
-    
+    float offX = 0;
+    float rowLen = mFont->GetStringWidth("JKLMNOPQR") + 14 * 7;
+
     for (int x = 0; x < nbitems; x++)
         if (keys[x])
         {

projects/mtg/src/WGui.cpp

@@ -2308,8 +2308,10 @@ void WGuiKeyBinder::setData()
     j->ResetInput();
 }
 
+#if (!defined IOS)
 static const JButton btnToCheck[] = { JGE_BTN_MENU, JGE_BTN_CTRL, JGE_BTN_RIGHT, JGE_BTN_LEFT, JGE_BTN_UP, JGE_BTN_DOWN,
                 JGE_BTN_OK, JGE_BTN_CANCEL, JGE_BTN_PRI, JGE_BTN_SEC, JGE_BTN_PREV, JGE_BTN_NEXT };
+#endif
 
 #define C(o) (static_cast<OptionKey*>(o))
 WGuiBase::CONFIRM_TYPE WGuiKeyBinder::needsConfirm()

projects/mtg/src/WResourceManager.cpp

@@ -11,8 +11,10 @@
 #endif
 #include "WFont.h"
 
+#ifdef FORCE_LOW_CACHE_MEMORY
 //#define FORCE_LOW_CACHE_MEMORY
 const unsigned int kConstrainedCacheLimit = 8 * 1024 * 1024;
+#endif
 
 extern bool neofont;
 int idCounter = OTHERS_OFFSET;