Sorted all source files in folders

[lugaru.git] / Source / GameDraw.cpp

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index a0c92d50e0f93542ef5930cd567c302fe7b5bf6f..d46b9b6a693c0f5b8cc71d8a257d0f2775858bf8 100644 (file)
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -19,12 +19,12 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "Game.h"
-#include "openal_wrapper.h"
-#include "Input.h"
-#include "Awards.h"
-#include "Menu.h"
-#include "Dialog.h"
-#include "Hotspot.h"
+#include "Audio/openal_wrapper.h"
+#include "Level/Awards.h"
+#include "Level/Dialog.h"
+#include "Level/Hotspot.h"
+#include "Menu/Menu.h"
+#include "Utils/Input.h"
 
 extern XYZ viewer;
 extern int environment;
@@ -62,7 +62,7 @@ extern float motionbluramount;
 extern bool isclient;
 extern bool alwaysblur;
 extern bool velocityblur;
-extern bool debugmode;
+extern bool devtools;
 extern int mainmenu;
 extern int bloodtoggle;
 extern int difficulty;
@@ -1051,9 +1051,9 @@ int Game::DrawGLScene(StereoSide side)
             if (!tutoriallevel && !winfreeze && !Dialog::inDialog() && !mainmenu) {
                 if (campaign) {
                     if (scoreadded)
-                        sprintf (string, "Score: %d", (int)accountactive->getCampaignScore());
+                        sprintf (string, "Score: %d", (int)Account::active().getCampaignScore());
                     else
-                        sprintf (string, "Score: %d", (int)accountactive->getCampaignScore() + (int)bonustotal);
+                        sprintf (string, "Score: %d", (int)Account::active().getCampaignScore() + (int)bonustotal);
                 }
                 if (!campaign)
                     sprintf (string, "Score: %d", (int)bonustotal);
@@ -1150,7 +1150,7 @@ int Game::DrawGLScene(StereoSide side)
             glColor4f(.5, .5, .5, 1);
 
 
-            if ((texttoggle || editorenabled) && debugmode && !mainmenu) {
+            if ((texttoggle || editorenabled) && devtools && !mainmenu) {
                 sprintf (string, "The framespersecond is %d.", (int)(fps));
                 text->glPrint(10, 30, string, 0, .8, 1024, 768);