- Modified DeckManager class to not use a global instance anymore when used within the game engine
- Modified DuelLayers to not use a global MTGPhaseGame instance anymore - Moved the reset of currentActionCard out of the ActionLayer render function : that fixes the remaing problematic tests in the multithreaded testsuite - Added a method in ActionLayer converting a card ability into a menu index - Used this new method in the game observer to log correctly AI ability actions - Added a DumpAssert method in the game observer, it can be used to dump the game and assert in order to easy crash reproduction - Cleaned up TargetList properties access - Added an optimisation in GuiMana to not compute update code if the rendering is not used (multi-threaded mode) - Added a deadlock detection in the test AI vs AI multithreaded mode - Fixed minor bugs in test AI vs AI multithreaded mode - Added a games/second counter in the test AI vs AI rendering
This commit is contained in:
@@ -13,12 +13,10 @@ protected:
|
||||
float animation;
|
||||
int currentState;
|
||||
WFont * mFont;
|
||||
static MTGGamePhase* instance;
|
||||
GameObserver* observer;
|
||||
|
||||
public:
|
||||
MTGGamePhase(GameObserver* g, int id);
|
||||
static MTGGamePhase* GetInstance() { return instance; };
|
||||
virtual void Update(float dt);
|
||||
bool CheckUserInput(JButton key);
|
||||
virtual MTGGamePhase * clone() const;
|
||||
|
||||
Reference in New Issue
Block a user