- 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:
@@ -8,21 +8,19 @@ using namespace std;
|
||||
class DeckManager
|
||||
{
|
||||
private:
|
||||
static bool instanceFlag;
|
||||
vector<DeckMetaData*> playerDeckOrderList;
|
||||
vector<DeckMetaData*> aiDeckOrderList;
|
||||
map<string, StatsWrapper*> playerDeckStatsMap;
|
||||
map<string, StatsWrapper*> aiDeckStatsMap;
|
||||
|
||||
static DeckManager *mInstance;
|
||||
|
||||
public:
|
||||
DeckManager()
|
||||
{
|
||||
//private constructor
|
||||
}
|
||||
|
||||
public:
|
||||
|
||||
vector<DeckMetaData*> playerDeckOrderList;
|
||||
vector<DeckMetaData*> aiDeckOrderList;
|
||||
|
||||
map<string, StatsWrapper*> playerDeckStatsMap;
|
||||
map<string, StatsWrapper*> aiDeckStatsMap;
|
||||
|
||||
void updateMetaDataList(vector<DeckMetaData*>* refList, bool isAI);
|
||||
vector<DeckMetaData*> * getPlayerDeckOrderList();
|
||||
vector<DeckMetaData*> * getAIDeckOrderList();
|
||||
@@ -40,7 +38,7 @@ public:
|
||||
//convenience method to get the difficulty rating between two decks. This should be refined a little more
|
||||
//since the eventual move of all deck meta data should be managed by this class
|
||||
|
||||
static int getDifficultyRating(Player *statsPlayer, Player *player);
|
||||
int getDifficultyRating(Player *statsPlayer, Player *player);
|
||||
|
||||
~DeckManager();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user