X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.cpp;h=5da0518b1583e617cffca29ad293b8e75bbe9645;hb=ce7c8b6c4db753fef7cf634a09aa63d8a4545c9b;hp=e0aeedac4727acde6ac68fa68105d6ddf42d8e42;hpb=afc437d91c5c31a6569349a118ace6876737889f;p=lugaru.git

diff --git a/Source/Game.cpp b/Source/Game.cpp
index e0aeeda..5da0518 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 <http://www.gnu.org/licenses/>.
 */
 
-#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 <SDL_thread.h>
 
 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;
@@ -108,11 +112,6 @@ int numchallengelevels = 0;
 
 bool console = false;
 std::string consoletext[15] = {};
-std::string displaytext[15] = {};
-float displaytime[15] = {};
-float displayblinkdelay = 0;
-bool displayblink = 0;
-unsigned displayselected = 0;
 float consoleblinkdelay = 0;
 bool consoleblink = 0;
 unsigned consoleselected = 0;
@@ -127,7 +126,6 @@ int targetlevel = 0;
 float changedelay = 0;
 
 bool waiting = false;
-Account* accountactive = NULL;
 }
 
 void Game::fireSound(int sound)