Fixed issues found by XCode.

2013-12-20 00:24:08 +01:00
parent db9f18a644
commit caec886e22
12 changed files with 11 additions and 23 deletions
--- a/projects/mtg/include/GameStateAwards.h
+++ b/projects/mtg/include/GameStateAwards.h
@@ -17,7 +17,6 @@ private:
    WSrcCards * setSrc;
    SimpleMenu * menu;
    bool showMenu;
-    bool showAlt;
    bool saveMe;
    int mState;
    int mDetailItem;
--- a/projects/mtg/include/GuiPlay.h
+++ b/projects/mtg/include/GuiPlay.h
@@ -47,7 +47,6 @@ protected:
    {
        static const float HEIGHT;
        unsigned attackers;
-        unsigned blockers;
        unsigned currentAttacker;
        float height;

--- a/projects/mtg/include/SimplePopup.h
+++ b/projects/mtg/include/SimplePopup.h
@@ -20,7 +20,6 @@ class SimplePopup: public JGuiController
 private:
    float mWidth, mX, mY;
    int mMaxLines;
-    int mFontId;
    DeckMetaData * mDeckInformation;
    string mTitle;
    WFont *mTextFont;
--- a/projects/mtg/include/WResource_Fwd.h
+++ b/projects/mtg/include/WResource_Fwd.h
@@ -1,12 +1,12 @@
 #ifndef WRESOURCE_FWD_H
 #define WRESOURCE_FWD_H

-#ifndef WP8
-#include <boost/shared_ptr.hpp>
-typedef boost::shared_ptr<JQuad> JQuadPtr;
-#else
+#if (__cplusplus > 199711L)
 #include <memory>
 typedef std::shared_ptr<JQuad> JQuadPtr;
+#else
+#include <boost/shared_ptr.hpp>
+typedef boost::shared_ptr<JQuad> JQuadPtr;
 #endif

 #endif