Merge branch 'master' into minmax

2014-08-07 22:29:41 +02:00
parent 541698f98e d7628b3eb2
commit 656ab78cf5
21 changed files with 347 additions and 320 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)
    {
    }
    
@@ -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_
@@ -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