Merge branch 'master' into wp8

2014-11-24 22:31:20 +01:00
parent f03fb82e25 b8da46ac18
commit 65973eea1c
67 changed files with 2720 additions and 425 deletions
@@ -72,7 +72,7 @@ public:
    }
    
    Interruptible(GameObserver* observer, int inID = 0, bool hasFocus = false)
-        : PlayGuiObject(40, x, y, inID, hasFocus), Targetable(observer), state(NOT_RESOLVED), display(0), source(NULL)
+        : PlayGuiObject(40, 0.0f, 0.0f, inID, hasFocus), Targetable(observer), state(NOT_RESOLVED), display(0), source(NULL)
    {
    }
    
@@ -64,6 +64,7 @@ class CardDescriptor: public MTGCardInstance
  string compareName;
  int CDopponentDamaged;
  int CDcontrollerDamaged;
+  int CDdamager;
 };

 #endif
@@ -1,13 +0,0 @@
-#ifndef _EFFECTS_H_
-#define _EFFECTS_H_
-
-#include <JGui.h>
-
-class Effect: public JGuiObject
-{
-    static int id_counter;
-public:
-    Effect() : JGuiObject(++id_counter) {};
-};
-
-#endif // _EFFECTS_H_
@@ -17,7 +17,6 @@ private:
    WSrcCards * setSrc;
    SimpleMenu * menu;
    bool showMenu;
-    bool showAlt;
    bool saveMe;
    int mState;
    int mDetailItem;
@@ -47,7 +47,6 @@ protected:
    {
        static const float HEIGHT;
        unsigned attackers;
-        unsigned blockers;
        unsigned currentAttacker;
        float height;

@@ -65,6 +65,7 @@ public:
    bool wasDealtDamage;
    bool damageToOpponent;
    bool damageToController;
+    bool damageToCreature;
    bool mPropertiesChangedSinceLastUpdate;
    int reduxamount;
    int flanked;
@@ -12,7 +12,6 @@
 #define GUI_OPPONENTHAND 5

 #include <JGui.h>
-#include "Effects.h"
 #include "WEvent.h"
 #include "Pos.h"

@@ -65,7 +64,6 @@ public:
    }
    ;
    virtual ~PlayGuiObject() {};
-    vector<Effect*> effects;
 };

 #endif
@@ -20,7 +20,6 @@ class SimplePopup: public JGuiController
 private:
    float mWidth, mX, mY;
    int mMaxLines;
-    int mFontId;
    DeckMetaData * mDeckInformation;
    string mTitle;
    WFont *mTextFont;
@@ -1,12 +1,12 @@
-#ifndef WRESOURCE_FWD_H
-#define WRESOURCE_FWD_H
-
-#if !defined(WP8) && !(defined(SDL_CONFIG) && defined(__MINGW32__))
-#include <boost/shared_ptr.hpp>
-typedef boost::shared_ptr<JQuad> JQuadPtr;
-#else
-#include <memory>
-typedef std::shared_ptr<JQuad> JQuadPtr;
-#endif
-
-#endif 
+#ifndef WRESOURCE_FWD_H
+#define WRESOURCE_FWD_H
+
+#if (_MSC_VER >= 1700) || (__cplusplus > 199711L)
+#include <memory>
+typedef std::shared_ptr<JQuad> JQuadPtr;
+#else
+#include <boost/shared_ptr.hpp>
+typedef boost::shared_ptr<JQuad> JQuadPtr;
+#endif
+
+#endif 
@@ -1,7 +1,7 @@
 #ifndef _DEBUG_H_
 #define _DEBUG_H_

-#if ((defined WIN32) || (defined WP8))
+#if ((defined WIN32) || (defined WP8)) && !defined(__MINGW32__)
 #define snprintf sprintf_s
 #endif