X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fmain.cpp;h=1ee05a5b0494cb53940c7f3f4f9fed7582a51547;hb=f0d67efd0a4269de425f6dad2e4e23dc869d3f91;hp=2144a8cf9c8612187fcdfd712ea71434f9518fa9;hpb=b84825978803615f45a9f128232e62431042aec0;p=lugaru.git diff --git a/Source/main.cpp b/Source/main.cpp index 2144a8c..1ee05a5 100644 --- a/Source/main.cpp +++ b/Source/main.cpp @@ -18,27 +18,27 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ +#include "Game.hpp" + +#include "Audio/openal_wrapper.hpp" +#include "Graphic/gamegl.hpp" +#include "MacCompatibility.hpp" +#include "User/Settings.hpp" + +#include +#include #include +#include #include #include -#include -#include #include -#include -#include "MacCompatibility.h" -#include "Graphic/gamegl.h" -#include "User/Settings.h" - -#include "Game.h" using namespace Game; -#include "Audio/openal_wrapper.h" - #ifdef WIN32 -#include #include -#include "win-res/resource.h" +#include +#include "win-res/resource.hpp" #endif extern float multiplier; @@ -53,7 +53,6 @@ extern int mainmenu; extern float slomospeed; extern float slomofreq; -extern bool visibleloading; extern int difficulty;