X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fmain.cpp;h=8463907b00b2aee8a91d2c3c2117f3a77546b76f;hb=4c3e64bc1763c8dc59320d23e613863308aa9e26;hp=f90f6205aeb57502fe4ad3493ad48f7987ecb498;hpb=2b4a9af9f7693a7715ae77f491157baac7257b10;p=lugaru.git diff --git a/Source/main.cpp b/Source/main.cpp index f90f620..8463907 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 "gamegl.h" -#include "MacCompatibility.h" -#include "Settings.h" - -#include "Game.h" using namespace Game; -#include "openal_wrapper.h" - #ifdef WIN32 -#include #include -#include "win-res/resource.h" +#include +#include "win-res/resource.hpp" #endif extern float multiplier; @@ -55,6 +55,8 @@ extern float slomospeed; extern float slomofreq; extern bool visibleloading; +extern int difficulty; + extern SDL_Window *sdlwindow; using namespace std; @@ -581,7 +583,7 @@ const option::Descriptor usage[] = {SOUND, OPENAL_OUTPUT_OSS, "", "force-oss", option::Arg::None, " --force-oss Force use of OSS back-end." }, {OPENALINFO, 0, "", "openal-info", option::Arg::None, " --openal-info Print info about OpenAL at launch." }, {SHOWRESOLUTIONS, 0, "", "showresolutions", option::Arg::None, " --showresolutions List the resolutions found by SDL at launch." }, - {DEVTOOLS, 0, "d", "devtools", option::Arg::None, " -d, --devtools Activates developer tools: console, level editor and debug information." }, + {DEVTOOLS, 0, "d", "devtools", option::Arg::None, " -d, --devtools Enable dev tools: console, level editor and debug info." }, {0,0,0,0,0,0} };