along with Lugaru. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "Game.hpp"
+
+#include "Audio/openal_wrapper.hpp"
+#include "Graphic/gamegl.hpp"
+#include "MacCompatibility.hpp"
+#include "User/Settings.hpp"
+
+#include <fstream>
+#include <iostream>
#include <math.h>
+#include <set>
#include <stdio.h>
#include <string.h>
-#include <fstream>
-#include <iostream>
#include <zlib.h>
-#include <set>
-#include "gamegl.h"
-#include "MacCompatibility.h"
-#include "Settings.h"
-
-#include "Game.h"
using namespace Game;
-#include "openal_wrapper.h"
-
#ifdef WIN32
-#include <windows.h>
#include <shellapi.h>
-#include "win-res/resource.h"
+#include <windows.h>
+#include "win-res/resource.hpp"
#endif
extern float multiplier;
extern float slomofreq;
extern bool visibleloading;
+extern int difficulty;
+
extern SDL_Window *sdlwindow;
using namespace std;
{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}
};
return 1;
}
- debugmode = commandLineOptions[DEBUG];
-
// !!! FIXME: we could use a Win32 API for this. --ryan.
#ifndef WIN32
chdirToAppPath(argv[0]);
LOGFUNC;
+#ifdef NDEBUG
try {
+#endif
{
newGame();
return 42;
}
+ if (commandLineOptions[DEVTOOLS]) {
+ devtools = true;
+ }
+
bool gameDone = false;
bool gameFocused = true;
CleanUp ();
return 0;
+#ifdef NDEBUG
} catch (const std::exception& error) {
CleanUp();
return -1;
}
+#endif
}