X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FGame.cpp;h=76455fb7a55fb9258f078f3a87aa7369c0044f4c;hb=e1b77b83ecf55f4ed9a02aeb2b699e58c3128eb6;hp=e0aeedac4727acde6ac68fa68105d6ddf42d8e42;hpb=afc437d91c5c31a6569349a118ace6876737889f;p=lugaru.git
diff --git a/Source/Game.cpp b/Source/Game.cpp
index e0aeeda..76455fb 100644
--- a/Source/Game.cpp
+++ b/Source/Game.cpp
@@ -18,10 +18,12 @@ You should have received a copy of the GNU General Public License
along with Lugaru. If not, see .
*/
-#include "Game.h"
-#include "openal_wrapper.h"
-#include "SDL_thread.h"
-#include "Dialog.h"
+#include "Game.hpp"
+
+#include "Audio/openal_wrapper.hpp"
+#include "Level/Dialog.hpp"
+
+#include
extern int mainmenu;
@@ -67,7 +69,9 @@ bool firstload = 0;
Texture hawktexture;
float hawkyaw = 0;
float hawkcalldelay = 0;
+
float leveltime = 0;
+float wonleveltime = 0;
float loadtime = 0;
Model hawk;
@@ -127,7 +131,6 @@ int targetlevel = 0;
float changedelay = 0;
bool waiting = false;
-Account* accountactive = NULL;
}
void Game::fireSound(int sound)