X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FMenu.cpp;h=6a3c6fed0d21ac88e12516db2465ef8eb93136de;hb=8a32dc9e4e1011b10f009e999d7d008aa2711d8a;hp=ff17d557a7b8068e262f9676c3814160cfb3fb78;hpb=afc437d91c5c31a6569349a118ace6876737889f;p=lugaru.git

diff --git a/Source/Menu.cpp b/Source/Menu.cpp
index ff17d55..6a3c6fe 100644
--- a/Source/Menu.cpp
+++ b/Source/Menu.cpp
@@ -282,62 +282,55 @@ void Menu::drawItems()
 
 void Menu::updateSettingsMenu()
 {
-    char sbuf[256];
-    if ((float)newscreenwidth > (float)newscreenheight * 1.61 || (float)newscreenwidth < (float)newscreenheight * 1.59)
-        sprintf (sbuf, "Resolution: %d*%d", (int)newscreenwidth, (int)newscreenheight);
-    else
-        sprintf (sbuf, "Resolution: %d*%d (widescreen)", (int)newscreenwidth, (int)newscreenheight);
-    Menu::setText(0, sbuf);
-    Menu::setText(14, fullscreen ? "Fullscreen: On" : "Fullscreen: Off");
-    if (newdetail == 0) Menu::setText(1, "Detail: Low");
-    if (newdetail == 1) Menu::setText(1, "Detail: Medium");
-    if (newdetail == 2) Menu::setText(1, "Detail: High");
-    if (bloodtoggle == 0) Menu::setText(2, "Blood: Off");
-    if (bloodtoggle == 1) Menu::setText(2, "Blood: On, low detail");
-    if (bloodtoggle == 2) Menu::setText(2, "Blood: On, high detail (slower)");
-    if (difficulty == 0) Menu::setText(3, "Difficulty: Easier");
-    if (difficulty == 1) Menu::setText(3, "Difficulty: Difficult");
-    if (difficulty == 2) Menu::setText(3, "Difficulty: Insane");
-    Menu::setText(4, ismotionblur ? "Blur Effects: Enabled (less compatible)" : "Blur Effects: Disabled (more compatible)");
-    Menu::setText(5, decals ? "Decals: Enabled (slower)" : "Decals: Disabled");
-    Menu::setText(6, musictoggle ? "Music: Enabled" : "Music: Disabled");
-    Menu::setText(9, invertmouse ? "Invert mouse: Yes" : "Invert mouse: No");
-    sprintf (sbuf, "Mouse Speed: %d", (int)(usermousesensitivity * 5));
-    Menu::setText(10, sbuf);
-    sprintf (sbuf, "Volume: %d%%", (int)(volume * 100));
-    Menu::setText(11, sbuf);
-    Menu::setText(13, showdamagebar ? "Damage Bar: On" : "Damage Bar: Off");
-    if (newdetail == detail && newscreenheight == (int)screenheight && newscreenwidth == (int)screenwidth)
-        sprintf (sbuf, "Back");
-    else
-        sprintf (sbuf, "Back (some changes take effect next time Lugaru is opened)");
-    Menu::setText(8, sbuf);
+    std::string sbuf = std::string("Resolution: ") + to_string(newscreenwidth) + "*" + to_string(newscreenheight);
+    if (((float)newscreenwidth <= (float)newscreenheight * 1.61) && ((float)newscreenwidth >= (float)newscreenheight * 1.59)) {
+        sbuf += " (widescreen)";
+    }
+    setText(0, sbuf);
+    setText(14, fullscreen ? "Fullscreen: On" : "Fullscreen: Off");
+    if (newdetail == 0) setText(1, "Detail: Low");
+    if (newdetail == 1) setText(1, "Detail: Medium");
+    if (newdetail == 2) setText(1, "Detail: High");
+    if (bloodtoggle == 0) setText(2, "Blood: Off");
+    if (bloodtoggle == 1) setText(2, "Blood: On, low detail");
+    if (bloodtoggle == 2) setText(2, "Blood: On, high detail (slower)");
+    if (difficulty == 0) setText(3, "Difficulty: Easier");
+    if (difficulty == 1) setText(3, "Difficulty: Difficult");
+    if (difficulty == 2) setText(3, "Difficulty: Insane");
+    setText(4, ismotionblur ? "Blur Effects: Enabled (less compatible)" : "Blur Effects: Disabled (more compatible)");
+    setText(5, decals ? "Decals: Enabled (slower)" : "Decals: Disabled");
+    setText(6, musictoggle ? "Music: Enabled" : "Music: Disabled");
+    setText(9, invertmouse ? "Invert mouse: Yes" : "Invert mouse: No");
+    setText(10, std::string("Mouse Speed: ") + to_string(int(usermousesensitivity * 5)));
+    setText(11, std::string("Volume: ") + to_string(int(volume * 100)) + "%");
+    setText(13, showdamagebar ? "Damage Bar: On" : "Damage Bar: Off");
+    if ((newdetail == detail) && (newscreenheight == (int)screenheight) && (newscreenwidth == (int)screenwidth)) {
+        setText(8, "Back");
+    } else {
+        setText(8, "Back (some changes take effect next time Lugaru is opened)");
+    }
 }
 
 void Menu::updateStereoConfigMenu()
 {
-    char sbuf[256];
-    sprintf(sbuf, "Stereo mode: %s", StereoModeName(newstereomode).c_str());
-    Menu::setText(0, sbuf);
-    sprintf(sbuf, "Stereo separation: %.3f", stereoseparation);
-    Menu::setText(1, sbuf);
-    sprintf(sbuf, "Reverse stereo: %s", stereoreverse ? "Yes" : "No");
-    Menu::setText(2, sbuf);
+    setText(0, std::string("Stereo mode: ") + StereoModeName(newstereomode));
+    setText(1, std::string("Stereo separation: ") + to_string(stereoseparation));
+    setText(2, std::string("Reverse stereo: ") + (stereoreverse ? "Yes" : "No"));
 }
 
 void Menu::updateControlsMenu()
 {
-    Menu::setText(0, (string)"Forwards: " + (keyselect == 0 ? "_" : Input::keyToChar(forwardkey)));
-    Menu::setText(1, (string)"Back: "    + (keyselect == 1 ? "_" : Input::keyToChar(backkey)));
-    Menu::setText(2, (string)"Left: "    + (keyselect == 2 ? "_" : Input::keyToChar(leftkey)));
-    Menu::setText(3, (string)"Right: "   + (keyselect == 3 ? "_" : Input::keyToChar(rightkey)));
-    Menu::setText(4, (string)"Crouch: "  + (keyselect == 4 ? "_" : Input::keyToChar(crouchkey)));
-    Menu::setText(5, (string)"Jump: "    + (keyselect == 5 ? "_" : Input::keyToChar(jumpkey)));
-    Menu::setText(6, (string)"Draw: "    + (keyselect == 6 ? "_" : Input::keyToChar(drawkey)));
-    Menu::setText(7, (string)"Throw: "   + (keyselect == 7 ? "_" : Input::keyToChar(throwkey)));
-    Menu::setText(8, (string)"Attack: "  + (keyselect == 8 ? "_" : Input::keyToChar(attackkey)));
-    if (debugmode) {
-        Menu::setText(9, (string)"Console: " + (keyselect == 9 ? "_" : Input::keyToChar(consolekey)));
+    setText(0, (string)"Forwards: " + (keyselect == 0 ? "_" : Input::keyToChar(forwardkey)));
+    setText(1, (string)"Back: "    + (keyselect == 1 ? "_" : Input::keyToChar(backkey)));
+    setText(2, (string)"Left: "    + (keyselect == 2 ? "_" : Input::keyToChar(leftkey)));
+    setText(3, (string)"Right: "   + (keyselect == 3 ? "_" : Input::keyToChar(rightkey)));
+    setText(4, (string)"Crouch: "  + (keyselect == 4 ? "_" : Input::keyToChar(crouchkey)));
+    setText(5, (string)"Jump: "    + (keyselect == 5 ? "_" : Input::keyToChar(jumpkey)));
+    setText(6, (string)"Draw: "    + (keyselect == 6 ? "_" : Input::keyToChar(drawkey)));
+    setText(7, (string)"Throw: "   + (keyselect == 7 ? "_" : Input::keyToChar(throwkey)));
+    setText(8, (string)"Attack: "  + (keyselect == 8 ? "_" : Input::keyToChar(attackkey)));
+    if (devtools) {
+        setText(9, (string)"Console: " + (keyselect == 9 ? "_" : Input::keyToChar(consolekey)));
     }
 }
 
@@ -359,81 +352,82 @@ Values of mainmenu :
 
 void Menu::Load()
 {
-    Menu::clearMenu();
+    clearMenu();
     switch (mainmenu) {
     case 1:
     case 2:
-        Menu::addImage(0, Mainmenuitems[0], 150, 480 - 128, 256, 128);
-        Menu::addButtonImage(1, Mainmenuitems[mainmenu == 1 ? 1 : 5], 18, 480 - 152 - 32, 128, 32);
-        Menu::addButtonImage(2, Mainmenuitems[2], 18, 480 - 228 - 32, 112, 32);
-        Menu::addButtonImage(3, Mainmenuitems[mainmenu == 1 ? 3 : 6], 18, 480 - 306 - 32, mainmenu == 1 ? 68 : 132, 32);
+        addImage(0, Mainmenuitems[0], 150, 480 - 128, 256, 128);
+        addButtonImage(1, Mainmenuitems[mainmenu == 1 ? 1 : 5], 18, 480 - 152 - 32, 128, 32);
+        addButtonImage(2, Mainmenuitems[2], 18, 480 - 228 - 32, 112, 32);
+        addButtonImage(3, Mainmenuitems[mainmenu == 1 ? 3 : 6], 18, 480 - 306 - 32, mainmenu == 1 ? 68 : 132, 32);
         break;
     case 3:
-        Menu::addButton( 0, "", 10 + 20, 440);
-        Menu::addButton(14, "", 10 + 400, 440);
-        Menu::addButton( 1, "", 10 + 60, 405);
-        Menu::addButton( 2, "", 10 + 70, 370);
-        Menu::addButton( 3, "", 10 + 20 - 1000, 335 - 1000);
-        Menu::addButton( 4, "", 10   , 335);
-        Menu::addButton( 5, "", 10 + 60, 300);
-        Menu::addButton( 6, "", 10 + 70, 265);
-        Menu::addButton( 9, "", 10   , 230);
-        Menu::addButton(10, "", 20   , 195);
-        Menu::addButton(11, "", 10 + 60, 160);
-        Menu::addButton(13, "", 30   , 125);
-        Menu::addButton( 7, "-Configure Controls-", 10 + 15, 90);
-        Menu::addButton(12, "-Configure Stereo -", 10 + 15, 55);
-        Menu::addButton(8, "Back", 10, 10);
+        addButton( 0, "", 10 + 20, 440);
+        addButton(14, "", 10 + 400, 440);
+        addButton( 1, "", 10 + 60, 405);
+        addButton( 2, "", 10 + 70, 370);
+        addButton( 3, "", 10 + 20 - 1000, 335 - 1000);
+        addButton( 4, "", 10   , 335);
+        addButton( 5, "", 10 + 60, 300);
+        addButton( 6, "", 10 + 70, 265);
+        addButton( 9, "", 10   , 230);
+        addButton(10, "", 20   , 195);
+        addButton(11, "", 10 + 60, 160);
+        addButton(13, "", 30   , 125);
+        addButton( 7, "-Configure Controls-", 10 + 15, 90);
+        addButton(12, "-Configure Stereo -", 10 + 15, 55);
+        addButton(8, "Back", 10, 10);
         updateSettingsMenu();
         break;
     case 4:
-        Menu::addButton(0, "", 10   , 400);
-        Menu::addButton(1, "", 10 + 40, 360);
-        Menu::addButton(2, "", 10 + 40, 320);
-        Menu::addButton(3, "", 10 + 30, 280);
-        Menu::addButton(4, "", 10 + 20, 240);
-        Menu::addButton(5, "", 10 + 40, 200);
-        Menu::addButton(6, "", 10 + 40, 160);
-        Menu::addButton(7, "", 10 + 30, 120);
-        Menu::addButton(8, "", 10 + 20, 80);
-        if (debugmode) {
-            Menu::addButton(9, "", 10 + 10, 40);
+        addButton(0, "", 10   , 400);
+        addButton(1, "", 10 + 40, 360);
+        addButton(2, "", 10 + 40, 320);
+        addButton(3, "", 10 + 30, 280);
+        addButton(4, "", 10 + 20, 240);
+        addButton(5, "", 10 + 40, 200);
+        addButton(6, "", 10 + 40, 160);
+        addButton(7, "", 10 + 30, 120);
+        addButton(8, "", 10 + 20, 80);
+        if (devtools) {
+            addButton(9, "", 10 + 10, 40);
         }
-        Menu::addButton(debugmode ? 10 : 9, "Back", 10, 10);
+        addButton(devtools ? 10 : 9, "Back", 10, 10);
         updateControlsMenu();
         break;
     case 5: {
         LoadCampaign();
-        Menu::addLabel(-1, accountactive->getName(), 5, 400);
-        Menu::addButton(1, "Tutorial", 5, 300);
-        Menu::addButton(2, "Challenge", 5, 240);
-        Menu::addButton(3, "Delete User", 400, 10);
-        Menu::addButton(4, "Main Menu", 5, 10);
-        Menu::addButton(5, "Change User", 5, 180);
-        Menu::addButton(6, "Campaign : " + accountactive->getCurrentCampaign(), 200, 420);
+        addLabel(-1, Account::active->getName(), 5, 400);
+        addButton(1, "Tutorial", 5, 300);
+        addButton(2, "Challenge", 5, 240);
+        addButton(3, "Delete User", 400, 10);
+        addButton(4, "Main Menu", 5, 10);
+        addButton(5, "Change User", 5, 180);
+        addButton(6, "Campaign : " + Account::active->getCurrentCampaign(), 200, 420);
 
         //show campaign map
         //with (2,-5) offset from old code
-        Menu::addImage(-1, Mainmenuitems[7], 150 + 2, 60 - 5, 400, 400);
+        addImage(-1, Mainmenuitems[7], 150 + 2, 60 - 5, 400, 400);
         //show levels
-        int numlevels = accountactive->getCampaignChoicesMade();
+        int numlevels = Account::active->getCampaignChoicesMade();
         numlevels += numlevels > 0 ? campaignlevels[numlevels - 1].nextlevel.size() : 1;
         for (int i = 0; i < numlevels; i++) {
             XYZ midpoint = campaignlevels[i].getCenter();
             float itemsize = campaignlevels[i].getWidth();
-            const bool active = i >= accountactive->getCampaignChoicesMade();
-            if (!active)
+            const bool active = (i >= Account::active->getCampaignChoicesMade());
+            if (!active) {
                 itemsize /= 2;
+            }
 
             if (i >= 1) {
                 XYZ start = campaignlevels[i - 1].getCenter();
-                Menu::addMapLine(start.x, start.y, midpoint.x - start.x, midpoint.y - start.y, 0.5, active ? 1 : 0.5, active ? 1 : 0.5, 0, 0);
+                addMapLine(start.x, start.y, midpoint.x - start.x, midpoint.y - start.y, 0.5, active ? 1 : 0.5, active ? 1 : 0.5, 0, 0);
             }
-            Menu::addMapMarker(NB_CAMPAIGN_MENU_ITEM + i, Mapcircletexture,
+            addMapMarker(NB_CAMPAIGN_MENU_ITEM + i, Mapcircletexture,
                                midpoint.x - itemsize / 2, midpoint.y - itemsize / 2, itemsize, itemsize, active ? 1 : 0.5, 0, 0);
 
             if (active) {
-                Menu::addMapLabel(-2, campaignlevels[i].description,
+                addMapLabel(-2, campaignlevels[i].description,
                                   campaignlevels[i].getStartX() + 10,
                                   campaignlevels[i].getStartY() - 4);
             }
@@ -441,67 +435,64 @@ void Menu::Load()
     }
     break;
     case 6:
-        Menu::addLabel(-1, "Are you sure you want to delete this user?", 10, 400);
-        Menu::addButton(1, "Yes", 10, 360);
-        Menu::addButton(2, "No", 10, 320);
+        addLabel(-1, "Are you sure you want to delete this user?", 10, 400);
+        addButton(1, "Yes", 10, 360);
+        addButton(2, "No", 10, 320);
         break;
     case 7:
         if (Account::getNbAccounts() < 8)
-            Menu::addButton(0, "New User", 10, 400);
+            addButton(0, "New User", 10, 400);
         else
-            Menu::addLabel(0, "No More Users", 10, 400);
-        Menu::addLabel(-2, "", 20, 400);
-        Menu::addButton(Account::getNbAccounts() + 1, "Back", 10, 10);
-        for (int i = 0; i < Account::getNbAccounts(); i++)
-            Menu::addButton(i + 1, Account::get(i)->getName(), 10, 340 - 20 * (i + 1));
+            addLabel(0, "No More Users", 10, 400);
+        addLabel(-2, "", 20, 400);
+        addButton(Account::getNbAccounts() + 1, "Back", 10, 10);
+        for (int i = 0; i < Account::getNbAccounts(); i++) {
+            addButton(i + 1, Account::get(i)->getName(), 10, 340 - 20 * (i + 1));
+        }
         break;
     case 8:
-        Menu::addButton(0, "Easier", 10, 400);
-        Menu::addButton(1, "Difficult", 10, 360);
-        Menu::addButton(2, "Insane", 10, 320);
+        addButton(0, "Easier", 10, 400);
+        addButton(1, "Difficult", 10, 360);
+        addButton(2, "Insane", 10, 320);
         break;
     case 9:
         for (int i = 0; i < numchallengelevels; i++) {
-            char temp[255];
-            string name = "";
-            sprintf (temp, "Level %d", i + 1);
-            for (int j = strlen(temp); j < 17; j++)
-                strcat(temp, " ");
-            name += temp;
-            sprintf (temp, "%d", (int)accountactive->getHighScore(i));
-            for (int j = strlen(temp); j < (32 - 17); j++)
-                strcat(temp, " ");
-            name += temp;
-            sprintf (temp, "%d:", (int)(((int)accountactive->getFastTime(i) - (int)(accountactive->getFastTime(i)) % 60) / 60));
-            if ((int)(accountactive->getFastTime(i)) % 60 < 10)
-                strcat(temp, "0");
-            name += temp;
-            sprintf (temp, "%d", (int)(accountactive->getFastTime(i)) % 60);
-            name += temp;
-
-            Menu::addButton(i, name, 10, 400 - i * 25, i > accountactive->getProgress() ? 0.5 : 1, 0, 0);
+            string name = "Level ";
+            name += to_string(i + 1);
+            if (name.size() < 17) {
+                name.append((17 - name.size()), ' ');
+            }
+            name += to_string(int(Account::active->getHighScore(i)));
+            if (name.size() < 32) {
+                name.append((32 - name.size()), ' ');
+            }
+            int fasttime = (int)round(Account::active->getFastTime(i));
+            name += to_string(int((fasttime - fasttime % 60) / 60));
+            name += ":";
+            if (fasttime % 60 < 10)
+                name += "0";
+            name += to_string(fasttime % 60);
+
+            addButton(i, name, 10, 400 - i * 25, i > Account::active->getProgress() ? 0.5 : 1, 0, 0);
         }
 
-        Menu::addButton(-1, "             High Score      Best Time", 10, 440);
-        Menu::addButton(numchallengelevels, "Back", 10, 10);
+        addButton(-1, "             High Score      Best Time", 10, 440);
+        addButton(numchallengelevels, "Back", 10, 10);
         break;
     case 10: {
-        Menu::addLabel(0, "Congratulations!", 220, 330);
-        Menu::addLabel(1, "You have avenged your family and", 140, 300);
-        Menu::addLabel(2, "restored peace to the island of Lugaru.", 110, 270);
-        Menu::addButton(3, "Back", 10, 10);
-        char sbuf[256];
-        sprintf(sbuf, "Your score:         %d", (int)accountactive->getCampaignScore());
-        Menu::addLabel(4, sbuf, 190, 200);
-        sprintf(sbuf, "Highest score:      %d", (int)accountactive->getCampaignHighScore());
-        Menu::addLabel(5, sbuf, 190, 180);
+        addLabel(0, "Congratulations!", 220, 330);
+        addLabel(1, "You have avenged your family and", 140, 300);
+        addLabel(2, "restored peace to the island of Lugaru.", 110, 270);
+        addButton(3, "Back", 10, 10);
+        addLabel(4, string("Your score:         ") + to_string((int)Account::active->getCampaignScore()), 190, 200);
+        addLabel(5, string("Highest score:      ") + to_string((int)Account::active->getCampaignHighScore()), 190, 180);
     }
     break;
     case 18:
-        Menu::addButton(0, "", 70, 400);
-        Menu::addButton(1, "", 10, 360);
-        Menu::addButton(2, "", 40, 320);
-        Menu::addButton(3, "Back", 10, 10);
+        addButton(0, "", 70, 400);
+        addButton(1, "", 10, 360);
+        addButton(2, "", 40, 320);
+        addButton(3, "Back", 10, 10);
         updateStereoConfigMenu();
         break;
     }
@@ -542,11 +533,11 @@ void Menu::Tick()
     }
 
     //menu buttons
-    selected = Menu::getSelected(mousecoordh * 640 / screenwidth, 480 - mousecoordv * 480 / screenheight);
+    selected = getSelected(mousecoordh * 640 / screenwidth, 480 - mousecoordv * 480 / screenheight);
 
     // some specific case where we do something even if the left mouse button is not pressed.
     if ((mainmenu == 5) && (endgame == 2)) {
-        accountactive->endGame();
+        Account::active->endGame();
         endgame = 0;
     }
     if (mainmenu == 10)
@@ -572,7 +563,7 @@ void Menu::Tick()
                 } else { //new game
                     fireSound(firestartsound);
                     flash();
-                    mainmenu = (accountactive ? 5 : 7);
+                    mainmenu = (Account::active ? 5 : 7);
                     selected = -1;
                 }
                 break;
@@ -699,11 +690,11 @@ void Menu::Tick()
         case 4:
             if (!waiting) {
                 fireSound();
-                if (selected < (debugmode ? 10 : 9) && keyselect == -1)
+                if (selected < (devtools ? 10 : 9) && keyselect == -1)
                     keyselect = selected;
                 if (keyselect != -1)
                     setKeySelected();
-                if (selected == (debugmode ? 10 : 9)) {
+                if (selected == (devtools ? 10 : 9)) {
                     flash();
                     mainmenu = 3;
                 }
@@ -713,7 +704,7 @@ void Menu::Tick()
         case 5:
             fireSound();
             flash();
-            if ((selected - NB_CAMPAIGN_MENU_ITEM >= accountactive->getCampaignChoicesMade())) {
+            if ((selected - NB_CAMPAIGN_MENU_ITEM >= Account::active->getCampaignChoicesMade())) {
                 startbonustotal = 0;
 
                 loading = 2;
@@ -723,8 +714,8 @@ void Menu::Tick()
                     TickOnceAfter();
                 else
                     LoadStuff();
-                whichchoice = selected - NB_CAMPAIGN_MENU_ITEM - accountactive->getCampaignChoicesMade();
-                actuallevel = (accountactive->getCampaignChoicesMade() > 0 ? campaignlevels[accountactive->getCampaignChoicesMade() - 1].nextlevel[whichchoice] : 0);
+                whichchoice = selected - NB_CAMPAIGN_MENU_ITEM - Account::active->getCampaignChoicesMade();
+                actuallevel = (Account::active->getCampaignChoicesMade() > 0 ? campaignlevels[Account::active->getCampaignChoicesMade() - 1].nextlevel[whichchoice] : 0);
                 visibleloading = 1;
                 stillloading = 1;
                 Loadlevel(campaignlevels[actuallevel].mapname.c_str());
@@ -765,16 +756,16 @@ void Menu::Tick()
             case 6:
                 vector<string> campaigns = ListCampaigns();
                 vector<string>::iterator c;
-                if ((c = find(campaigns.begin(), campaigns.end(), accountactive->getCurrentCampaign())) == campaigns.end()) {
+                if ((c = find(campaigns.begin(), campaigns.end(), Account::active->getCurrentCampaign())) == campaigns.end()) {
                     if (!campaigns.empty())
-                        accountactive->setCurrentCampaign(campaigns.front());
+                        Account::active->setCurrentCampaign(campaigns.front());
                 } else {
                     c++;
                     if (c == campaigns.end())
                         c = campaigns.begin();
-                    accountactive->setCurrentCampaign(*c);
+                    Account::active->setCurrentCampaign(*c);
                 }
-                Menu::Load();
+                Load();
                 break;
             }
             break;
@@ -782,7 +773,7 @@ void Menu::Tick()
             fireSound();
             if (selected == 1) {
                 flash();
-                accountactive = Account::destroy(accountactive);
+                Account::destroyActive();
                 mainmenu = 7;
             } else if (selected == 2) {
                 flash();
@@ -796,13 +787,14 @@ void Menu::Tick()
             } else if (selected < Account::getNbAccounts() + 1) {
                 flash();
                 mainmenu = 5;
-                accountactive = Account::get(selected - 1);
+                Account::setActive(selected - 1);
             } else if (selected == Account::getNbAccounts() + 1) {
                 flash();
-                if (accountactive)
+                if (Account::active) {
                     mainmenu = 5;
-                else
+                } else {
                     mainmenu = 1;
+                }
                 displaytext[0].clear();
                 displayselected = 0;
                 entername = 0;
@@ -812,11 +804,11 @@ void Menu::Tick()
             fireSound();
             flash();
             if (selected <= 2)
-                accountactive->setDifficulty(selected);
+                Account::active->setDifficulty(selected);
             mainmenu = 5;
             break;
         case 9:
-            if (selected < numchallengelevels && selected <= accountactive->getProgress()) {
+            if (selected < numchallengelevels && selected <= Account::active->getProgress()) {
                 fireSound();
                 flash();
 
@@ -883,7 +875,7 @@ void Menu::Tick()
         inputText(displaytext[0], &displayselected);
         if (!waiting) { // the input as finished
             if (!displaytext[0].empty()) { // with enter
-                accountactive = Account::add(string(displaytext[0]));
+                Account::add(string(displaytext[0]));
 
                 mainmenu = 8;
 
@@ -896,7 +888,7 @@ void Menu::Tick()
                 displayselected = 0;
             }
             entername = 0;
-            Menu::Load();
+            Load();
         }
 
         displayblinkdelay -= multiplier;
@@ -907,12 +899,12 @@ void Menu::Tick()
     }
 
     if (entername) {
-        Menu::setText(0, displaytext[0], 20, 400, -1, -1);
-        Menu::setText(-2, displayblink ? "_" : "", 20 + displayselected * 10, 400, -1, -1);
+        setText(0, displaytext[0], 20, 400, -1, -1);
+        setText(-2, displayblink ? "_" : "", 20 + displayselected * 10, 400, -1, -1);
     }
 
     if (oldmainmenu != mainmenu)
-        Menu::Load();
+        Load();
     oldmainmenu = mainmenu;
 
 }