Sorted all source files in folders

[lugaru.git] / Source / GameTick.cpp

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 5dfc3939ad2e53ba4de9a94110983babb76dbbba..37a29f583de2c8f30d14c0faf36a1bca2b6c3029 100644 (file)
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -35,17 +35,17 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include <cmath>
 #include <dirent.h>
 #include "Game.h"
-#include "openal_wrapper.h"
-#include "Settings.h"
-#include "Input.h"
 #include "Animation/Animation.h"
-#include "Awards.h"
-#include "Menu.h"
-#include "ConsoleCmds.h"
-#include "Dialog.h"
+#include "Audio/openal_wrapper.h"
+#include "Devtools/ConsoleCmds.h"
+#include "Level/Awards.h"
+#include "Level/Campaign.h"
+#include "Level/Dialog.h"
+#include "Level/Hotspot.h"
+#include "Menu/Menu.h"
+#include "User/Settings.h"
 #include "Utils/Folders.h"
-#include "Hotspot.h"
-#include "Campaign.h"
+#include "Utils/Input.h"
 
 #include <algorithm>
 #include <set>
@@ -90,7 +90,7 @@ extern bool mousejump;
 extern float viewdistance;
 extern bool freeze;
 extern XYZ windvector;
-extern bool debugmode;
+extern bool devtools;
 int leveltheme;
 extern int mainmenu;
 extern int oldmainmenu;
@@ -692,8 +692,9 @@ void Game::Loadlevel(const std::string& name)
     damagedealt = 0;
     damagetaken = 0;
 
-    if (accountactive)
-        difficulty = accountactive->getDifficulty();
+    if (Account::hasActive()) {
+        difficulty = Account::active().getDifficulty();
+    }
 
     Hotspot::hotspots.clear();
     Hotspot::current = -1;
@@ -1639,10 +1640,10 @@ void doTutorial()
     }
 }
 
-void doDebugKeys()
+void doDevKeys()
 {
     float headprop, bodyprop, armprop, legprop;
-    if (!debugmode) {
+    if (!devtools) {
         return;
     }
 
@@ -4604,14 +4605,14 @@ void Game::Tick()
             leveltime += multiplier;
 
         //keys
-        if (Input::isKeyDown(SDL_SCANCODE_LALT) && Input::isKeyPressed(SDL_SCANCODE_V) && debugmode) {
+        if (Input::isKeyDown(SDL_SCANCODE_LALT) && Input::isKeyPressed(SDL_SCANCODE_V) && devtools) {
             freeze = !freeze;
             if (freeze) {
                 OPENAL_SetFrequency(OPENAL_ALL);
             }
         }
 
-        if (Input::isKeyPressed(consolekey) && debugmode) {
+        if (Input::isKeyPressed(consolekey) && devtools) {
             console = !console;
             if (console) {
                 OPENAL_SetFrequency(OPENAL_ALL);
@@ -4976,7 +4977,7 @@ void Game::Tick()
                 hawkcalldelay = 16 + abs(Random() % 8);
             }
 
-            doDebugKeys();
+            doDevKeys();
 
             doAttacks();
 
@@ -5002,7 +5003,7 @@ void Game::Tick()
                     (whichlevel != -2 &&
                      (Input::isKeyDown(SDL_SCANCODE_Z) &&
                       Input::isKeyDown(SDL_SCANCODE_LGUI) &&
-                      debugmode) ||
+                      devtools) ||
                      (Input::isKeyDown(jumpkey) &&
                       !respawnkeydown &&
                       !oldattackkey &&
@@ -5772,7 +5773,7 @@ void Game::Tick()
                                     Person::players[i]->crouchtogglekeydown = 1;
                                 } else Person::players[i]->velocity.y = 5;
 
-                                if (mousejump && i == 0 && debugmode) {
+                                if (mousejump && i == 0 && devtools) {
                                     if (!Person::players[i]->isLanding())
                                         Person::players[i]->tempdeltav = deltav;
                                     if (Person::players[i]->tempdeltav < 0)
@@ -5797,7 +5798,7 @@ void Game::Tick()
                             if (Person::players[i]->animTarget == jumpupanim &&
                                     (((!floatjump &&
                                        !editorenabled) ||
-                                      !debugmode) ||
+                                      !devtools) ||
                                      Person::players[i]->aitype != playercontrolled)) {
                                 if (Person::players[i]->jumppower > multiplier * 6) {
                                     Person::players[i]->velocity.y += multiplier * 6;
@@ -5808,7 +5809,7 @@ void Game::Tick()
                                     Person::players[i]->jumppower = 0;
                                 }
                             }
-                            if (((floatjump || editorenabled) && debugmode) && i == 0)
+                            if (((floatjump || editorenabled) && devtools) && i == 0)
                                 Person::players[i]->velocity.y += multiplier * 30;
                         }
 
@@ -6217,11 +6218,11 @@ void Game::TickOnceAfter()
             if (changedelay > 0 && !Person::players[0]->dead && !won) {
                 //high scores, awards, win
                 if (campaign) {
-                    accountactive->winCampaignLevel(whichchoice, bonustotal, leveltime);
+                    Account::active().winCampaignLevel(whichchoice, bonustotal, leveltime);
                     scoreadded = 1;
                 } else {
                     wonleveltime = leveltime;
-                    accountactive->winLevel(whichlevel, bonustotal - startbonustotal, leveltime);
+                    Account::active().winLevel(whichlevel, bonustotal - startbonustotal, leveltime);
                 }
                 won = 1;
             }
@@ -6264,7 +6265,7 @@ void Game::TickOnceAfter()
 
                     fireSound(firestartsound);
 
-                    Loadlevel(campaignlevels[accountactive->getCampaignChoicesMade()].mapname.c_str());
+                    Loadlevel(campaignlevels[Account::active().getCampaignChoicesMade()].mapname.c_str());
 
                     fireSound();