Account active is now stored as an integer to avoid weird loops to find the right id

diff --git a/Source/Account.cpp b/Source/Account.cpp
index bae2abda7bfcb45c29312e64da0c1ce6388f09ad..560592f62ebf7a0809b579d8b0b1a9757dcbd0e7 100644 (file)
--- a/Source/Account.cpp
+++ b/Source/Account.cpp
@@ -30,7 +30,7 @@ using namespace std;
 extern bool devtools;
 
 vector<Account*> Account::accounts = vector<Account*>();
-Account* Account::_active = nullptr;
+int Account::i_active = -1;
 
 Account::Account(const string& name) : name(name), campaignProgress()
 {
@@ -52,36 +52,47 @@ void Account::setCurrentCampaign(const string& name)
 void Account::add(const string& name)
 {
     accounts.push_back(new Account(name));
-    _active = accounts.back();
+    i_active = accounts.size() - 1;
 }
 
 Account* Account::get(int i)
 {
-    if ((i >= 0) && (i < int(accounts.size()))) {
-        return accounts[i];
-    } else
-        return NULL;
+    return accounts.at(i);
+}
+
+int Account::getNbAccounts()
+{
+    return accounts.size();
+}
+
+bool Account::hasActive()
+{
+    return (i_active >= 0);
+}
+
+Account& Account::active()
+{
+    return *(accounts.at(i_active));
 }
 
 void Account::setActive(int i)
 {
-    _active = get(i);
+    if ((i >= 0) && (i < int(accounts.size()))) {
+        i_active = i;
+    } else {
+        cerr << "Tried to set active account to " << i << " but there is not such account" << endl;
+        i_active = -1;
+    }
 }
 
 void Account::destroyActive()
 {
-    for (unsigned i = 0; i < accounts.size(); i++) {
-        if (accounts[i] == _active) {
-            accounts.erase(accounts.begin() + i);
-            _active = nullptr;
-            return;
-        }
-    }
-    cerr << "Unexpected error : User " << _active->getName() << " not found" << endl;
-    if (accounts.empty()) {
-        _active = nullptr;
+    if ((i_active >= 0) && (i_active < int(accounts.size()))) {
+        accounts.erase(accounts.begin() + i_active);
+        i_active = -1;
     } else {
-        _active = accounts.front();
+        cerr << "Tried to destroy active account " << i_active << " but there is not such account" << endl;
+        i_active = -1;
     }
 }
 
@@ -191,10 +202,10 @@ void Account::loadFile(string filename)
         }
 
         fclose(tfile);
-        _active = get(iactive);
+        setActive(iactive);
     } else {
         perror(("Couldn't load users from " + filename).c_str());
-        _active = nullptr;
+        i_active = -1;
     }
 }
 
@@ -206,7 +217,7 @@ void Account::saveFile(string filename)
     tfile = fopen(filename.c_str(), "wb" );
     if (tfile) {
         fpackf(tfile, "Bi", getNbAccounts());
-        fpackf(tfile, "Bi", indice(Account::_active));
+        fpackf(tfile, "Bi", i_active);
 
         for (int i = 0; i < getNbAccounts(); i++) {
             Account* a = Account::get(i);
@@ -255,12 +266,3 @@ void Account::saveFile(string filename)
         perror(("Couldn't save users in " + filename).c_str());
     }
 }
-
-int Account::indice(Account* a)
-{
-    for (unsigned i = 0; i < accounts.size(); i++) {
-        if (accounts[i] == a)
-            return i;
-    }
-    return -1;
-}

diff --git a/Source/Account.h b/Source/Account.h
index f9bc5e1654940c614acfa9cda7b40309dee66534..dcaba951469fc03afdbacd556d1792775b31a8a1 100644 (file)
--- a/Source/Account.h
+++ b/Source/Account.h
@@ -49,11 +49,10 @@ public:
     static Account* get(int i);
     static void loadFile(std::string filename);
     static void saveFile(std::string filename);
-    static int indice(Account* a);
+    static int getNbAccounts();
 
-    static bool hasActive() { return (_active != nullptr); }
-    static Account& active() { return *_active; }
-    static Account* _active;
+    static bool hasActive();
+    static Account& active();
 
     void endGame();
     void winCampaignLevel(int choice, float score, float time);
@@ -109,10 +108,11 @@ public:
     };
     void setCurrentCampaign(const std::string& name);
 
-    static int getNbAccounts() {
-        return accounts.size();
-    };
 private:
+    //statics
+    static std::vector<Account*> accounts;
+    static int i_active;
+
     Account(const std::string& name = "");
     int difficulty;
     int progress; // progress in challenge levels
@@ -124,9 +124,6 @@ private:
 
     std::string currentCampaign;
     std::map<std::string, CampaignProgress> campaignProgress;
-
-    //statics
-    static std::vector<Account*> accounts;
 };
 
 #endif