Stopped using Account pointers, and removed general difficulty setting (difficulty...

[lugaru.git] / Source / GameInitDispose.cpp

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index e08ff8efc712823c24902ddff34dba64fb44f09b..c070d293872a430e7b922908e5adb8cedcec805e 100644 (file)
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -57,7 +57,6 @@ extern float flashamount, flashr, flashg, flashb;
 extern int flashdelay;
 extern int whichjointstartarray[26];
 extern int whichjointendarray[26];
-extern int difficulty;
 extern float slomospeed;
 extern bool gamestarted;
 
@@ -79,7 +78,7 @@ void Dispose()
     LOGFUNC;
 
     if (Game::endgame == 2) {
-        Account::active->endGame();
+        Account::active().endGame();
         Game::endgame = 0;
     }
 
@@ -458,7 +457,7 @@ void Game::InitGame()
 
     numchallengelevels = 14;
 
-    Account::active = Account::loadFile(Folders::getUserDataPath()+"/users");
+    Account::loadFile(Folders::getUserDataPath()+"/users");
 
     whichjointstartarray[0] = righthip;
     whichjointendarray[0] = rightfoot;