X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2Fmain.cpp;h=1ee05a5b0494cb53940c7f3f4f9fed7582a51547;hb=b32cd80b243d77cd80e026c7ae73e33ec39b1de9;hp=e0bf4309188959db1be8b8f52e1946faeaa20e0e;hpb=3e35667d102382398aa701a883f1fd951eed0ee3;p=lugaru.git
diff --git a/Source/main.cpp b/Source/main.cpp
index e0bf430..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 "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;
@@ -53,7 +53,8 @@ extern int mainmenu;
extern float slomospeed;
extern float slomofreq;
-extern bool visibleloading;
+
+extern int difficulty;
extern SDL_Window *sdlwindow;
@@ -581,7 +582,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." },
- {DEBUG, 0, "d", "debug", option::Arg::None, " -d, --debug Activates 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}
};
@@ -617,8 +618,6 @@ int main(int argc, char **argv)
return 1;
}
- debugmode = commandLineOptions[DEBUG];
-
// !!! FIXME: we could use a Win32 API for this. --ryan.
#ifndef WIN32
chdirToAppPath(argv[0]);
@@ -626,7 +625,9 @@ int main(int argc, char **argv)
LOGFUNC;
- //~ try {
+#ifdef NDEBUG
+ try {
+#endif
{
newGame();
@@ -635,6 +636,10 @@ int main(int argc, char **argv)
return 42;
}
+ if (commandLineOptions[DEVTOOLS]) {
+ devtools = true;
+ }
+
bool gameDone = false;
bool gameFocused = true;
@@ -677,16 +682,18 @@ int main(int argc, char **argv)
CleanUp ();
return 0;
- //~ } catch (const std::exception& error) {
- //~ CleanUp();
+#ifdef NDEBUG
+ } catch (const std::exception& error) {
+ CleanUp();
- //~ std::string e = "Caught exception: ";
- //~ e += error.what();
+ std::string e = "Caught exception: ";
+ e += error.what();
- //~ LOG(e);
+ LOG(e);
- //~ SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Exception catched", error.what(), NULL);
+ SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Exception catched", error.what(), NULL);
- //~ return -1;
- //~ }
+ return -1;
+ }
+#endif
}