X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.cpp;h=5da0518b1583e617cffca29ad293b8e75bbe9645;hb=03fbcc5b5e18dbf62c48849fc8d02cd250aa744e;hp=39b7df764627e1cb9ed0258acad3a9806afbf1ce;hpb=96f10b742814fab1d16e3fa704160773c3381795;p=lugaru.git diff --git a/Source/Game.cpp b/Source/Game.cpp index 39b7df7..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 . */ -#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; @@ -110,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; @@ -129,7 +126,6 @@ int targetlevel = 0; float changedelay = 0; bool waiting = false; -Account* accountactive = NULL; } void Game::fireSound(int sound)