X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FGameInitDispose.cpp;h=036f80f9a4fc737d8c4d8ed2085958b8318dc2e6;hb=b84825978803615f45a9f128232e62431042aec0;hp=12515eb7cab8442f660cb0e8cb497a1c0d4ca9b3;hpb=8a32dc9e4e1011b10f009e999d7d008aa2711d8a;p=lugaru.git diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp index 12515eb..036f80f 100644 --- a/Source/GameInitDispose.cpp +++ b/Source/GameInitDispose.cpp @@ -19,11 +19,11 @@ along with Lugaru. If not, see . */ #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,7 +78,7 @@ void Dispose() LOGFUNC; if (Game::endgame == 2) { - Account::active->endGame(); + Account::active().endGame(); Game::endgame = 0; }