X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameInitDispose.cpp;h=036f80f9a4fc737d8c4d8ed2085958b8318dc2e6;hb=b84825978803615f45a9f128232e62431042aec0;hp=2103c2184cb570d54dd3fe00c09498ca071e3c47;hpb=afc437d91c5c31a6569349a118ace6876737889f;p=lugaru.git

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index 2103c21..036f80f 100644
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -19,11 +19,11 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "Game.h"
-#include "openal_wrapper.h"
 #include "Animation/Animation.h"
-#include "Texture.h"
+#include "Audio/openal_wrapper.h"
+#include "Graphic/Texture.h"
+#include "Menu/Menu.h"
 #include "Utils/Folders.h"
-#include "Menu.h"
 
 extern float screenwidth, screenheight;
 extern float viewdistance;
@@ -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,11 +78,11 @@ void Dispose()
     LOGFUNC;
 
     if (Game::endgame == 2) {
-        Game::accountactive->endGame();
+        Account::active().endGame();
         Game::endgame = 0;
     }
 
-    Account::saveFile(Folders::getUserDataPath()+"/users", Game::accountactive);
+    Account::saveFile(Folders::getUserDataPath()+"/users");
 
     //textures.clear();
 
@@ -458,7 +457,7 @@ void Game::InitGame()
 
     numchallengelevels = 14;
 
-    accountactive = Account::loadFile(Folders::getUserDataPath()+"/users");
+    Account::loadFile(Folders::getUserDataPath()+"/users");
 
     whichjointstartarray[0] = righthip;
     whichjointendarray[0] = rightfoot;