X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fmain.cpp;h=cacfabdc99b2a0632e8b759636a39b00d73151d9;hb=a8e0e96af3222c42663b3c60158caed20ac46829;hp=c78dc28755817be7376ad9edb5c1d5cedeb76800;hpb=14c23210702eee8191dd122f98ef4e43d57295b7;p=lugaru.git diff --git a/Source/main.cpp b/Source/main.cpp index c78dc28..cacfabd 100644 --- a/Source/main.cpp +++ b/Source/main.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2003, 2010 - Wolfire Games -Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) +Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file) This file is part of Lugaru. @@ -18,31 +18,31 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include -#include -#include +#include "Game.hpp" + +#include "Audio/openal_wrapper.hpp" +#include "Graphic/gamegl.hpp" +#include "Platform/Platform.hpp" +#include "User/Settings.hpp" +#include "Version.hpp" + #include #include -#include +#include #include -#include "gamegl.h" -#include "MacCompatibility.h" -#include "Settings.h" - -#include "Game.h" +#include +#include using namespace Game; -#include "openal_wrapper.h" - #ifdef WIN32 -#include #include -#include "win-res/resource.h" +#include +#else +#include #endif extern float multiplier; -extern float sps; extern float realmultiplier; extern int slomo; extern bool cellophane; @@ -54,135 +54,67 @@ extern int mainmenu; extern float slomospeed; extern float slomofreq; -extern bool visibleloading; -extern SDL_Window *sdlwindow; +extern int difficulty; + +extern SDL_Window* sdlwindow; using namespace std; -set> resolutions; +set> resolutions; // statics/globals (internal only) ------------------------------------------ -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable: 4273) -#endif - -#ifndef __MINGW32__ // FIXME: Temporary workaround for GL-8 -#define GL_FUNC(ret,fn,params,call,rt) \ - extern "C" { \ - static ret (GLAPIENTRY *p##fn) params = NULL; \ - ret GLAPIENTRY fn params { rt p##fn call; } \ - } -#include "glstubs.h" -#undef GL_FUNC -#endif // __MINGW32__ - -#ifdef _MSC_VER -#pragma warning(pop) -#endif - -static bool lookup_glsym(const char *funcname, void **func) -{ - *func = SDL_GL_GetProcAddress(funcname); - if (*func == NULL) { - fprintf(stderr, "Failed to find OpenGL symbol \"%s\"\n", funcname); - return false; - } - return true; -} - -static bool lookup_all_glsyms(void) -{ - bool retval = true; -#ifndef __MINGW32__ // FIXME: Temporary workaround for GL-8 -#define GL_FUNC(ret,fn,params,call,rt) \ - if (!lookup_glsym(#fn, (void **) &p##fn)) retval = false; -#include "glstubs.h" -#undef GL_FUNC -#endif // __MINGW32__ - return retval; -} - -#ifndef __MINGW32__ // FIXME: Temporary workaround for GL-8 -static void GLAPIENTRY glDeleteTextures_doNothing(GLsizei n, const GLuint *textures) -{ - // no-op. -} -#endif // __MINGW32__ - -#ifdef MessageBox -#undef MessageBox -#endif -#define MessageBox(hwnd,text,title,flags) STUBBED("msgbox") - // Menu defs int kContextWidth; int kContextHeight; -static int _argc = 0; -static char **_argv = NULL; - -bool cmdline(const char *cmd) -{ - for (int i = 1; i < _argc; i++) { - char *arg = _argv[i]; - while (*arg == '-') - arg++; - if (strcasecmp(arg, cmd) == 0) - return true; - } - - return false; -} - //----------------------------------------------------------------------------------------------------------------------- // OpenGL Drawing void initGL() { - glClear( GL_COLOR_BUFFER_BIT ); + glClear(GL_COLOR_BUFFER_BIT); swap_gl_buffers(); // clear all states - glDisable( GL_ALPHA_TEST); - glDisable( GL_BLEND); - glDisable( GL_DEPTH_TEST); - glDisable( GL_FOG); - glDisable( GL_LIGHTING); - glDisable( GL_LOGIC_OP); - glDisable( GL_TEXTURE_1D); - glDisable( GL_TEXTURE_2D); - glPixelTransferi( GL_MAP_COLOR, GL_FALSE); - glPixelTransferi( GL_RED_SCALE, 1); - glPixelTransferi( GL_RED_BIAS, 0); - glPixelTransferi( GL_GREEN_SCALE, 1); - glPixelTransferi( GL_GREEN_BIAS, 0); - glPixelTransferi( GL_BLUE_SCALE, 1); - glPixelTransferi( GL_BLUE_BIAS, 0); - glPixelTransferi( GL_ALPHA_SCALE, 1); - glPixelTransferi( GL_ALPHA_BIAS, 0); + glDisable(GL_ALPHA_TEST); + glDisable(GL_BLEND); + glDisable(GL_DEPTH_TEST); + glDisable(GL_FOG); + glDisable(GL_LIGHTING); + glDisable(GL_LOGIC_OP); + glDisable(GL_TEXTURE_1D); + glDisable(GL_TEXTURE_2D); + glPixelTransferi(GL_MAP_COLOR, GL_FALSE); + glPixelTransferi(GL_RED_SCALE, 1); + glPixelTransferi(GL_RED_BIAS, 0); + glPixelTransferi(GL_GREEN_SCALE, 1); + glPixelTransferi(GL_GREEN_BIAS, 0); + glPixelTransferi(GL_BLUE_SCALE, 1); + glPixelTransferi(GL_BLUE_BIAS, 0); + glPixelTransferi(GL_ALPHA_SCALE, 1); + glPixelTransferi(GL_ALPHA_BIAS, 0); // set initial rendering states - glShadeModel( GL_SMOOTH); - glClearDepth( 1.0f); - glDepthFunc( GL_LEQUAL); - glDepthMask( GL_TRUE); - glEnable( GL_DEPTH_TEST); - glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); - glCullFace( GL_FRONT); - glEnable( GL_CULL_FACE); - glEnable( GL_LIGHTING); - glEnable( GL_DITHER); - glEnable( GL_COLOR_MATERIAL); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glAlphaFunc( GL_GREATER, 0.5f); - - if ( CanInitStereo(stereomode) ) { + glShadeModel(GL_SMOOTH); + glClearDepth(1.0f); + glDepthFunc(GL_LEQUAL); + glDepthMask(GL_TRUE); + glEnable(GL_DEPTH_TEST); + glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); + glCullFace(GL_FRONT); + glEnable(GL_CULL_FACE); + glEnable(GL_LIGHTING); + glEnable(GL_DITHER); + glEnable(GL_COLOR_MATERIAL); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glAlphaFunc(GL_GREATER, 0.5f); + + if (CanInitStereo(stereomode)) { InitStereo(stereomode); } else { fprintf(stderr, "Failed to initialize stereo, disabling.\n"); @@ -202,7 +134,7 @@ void toggleFullscreen() SDL_SetWindowFullscreen(sdlwindow, flags); } -SDL_bool sdlEventProc(const SDL_Event &e) +SDL_bool sdlEventProc(const SDL_Event& e) { switch (e.type) { case SDL_QUIT: @@ -212,36 +144,35 @@ SDL_bool sdlEventProc(const SDL_Event &e) if (e.window.event == SDL_WINDOWEVENT_CLOSE) { return SDL_FALSE; } - break; + break; case SDL_MOUSEMOTION: deltah += e.motion.xrel; deltav += e.motion.yrel; - break; + break; case SDL_KEYDOWN: if ((e.key.keysym.scancode == SDL_SCANCODE_G) && (e.key.keysym.mod & KMOD_CTRL)) { SDL_bool mode = SDL_TRUE; - if ((SDL_GetWindowFlags(sdlwindow) & SDL_WINDOW_FULLSCREEN) == 0) + if ((SDL_GetWindowFlags(sdlwindow) & SDL_WINDOW_FULLSCREEN) == 0) { mode = (SDL_GetWindowGrab(sdlwindow) ? SDL_FALSE : SDL_TRUE); + } SDL_SetWindowGrab(sdlwindow, mode); SDL_SetRelativeMouseMode(mode); - } else if ( (e.key.keysym.scancode == SDL_SCANCODE_RETURN) && (e.key.keysym.mod & KMOD_ALT) ) { + } else if ((e.key.keysym.scancode == SDL_SCANCODE_RETURN) && (e.key.keysym.mod & KMOD_ALT)) { toggleFullscreen(); } - break; + break; } return SDL_TRUE; } - - // -------------------------------------------------------------------------- static Point gMidPoint; -bool SetUp () +bool SetUp() { LOGFUNC; @@ -252,18 +183,16 @@ bool SetUp () DefaultSettings(); - if (!SDL_WasInit(SDL_INIT_VIDEO)) + if (!SDL_WasInit(SDL_INIT_VIDEO)) { if (SDL_Init(SDL_INIT_VIDEO) == -1) { fprintf(stderr, "SDL_Init() failed: %s\n", SDL_GetError()); return false; } + } if (!LoadSettings()) { fprintf(stderr, "Failed to load config, creating default\n"); SaveSettings(); } - if (kBitsPerPixel != 32 && kBitsPerPixel != 16) { - kBitsPerPixel = 16; - } if (SDL_GL_LoadLibrary(NULL) == -1) { fprintf(stderr, "SDL_GL_LoadLibrary() failed: %s\n", SDL_GetError()); @@ -274,11 +203,13 @@ bool SetUp () for (int displayIdx = 0; displayIdx < SDL_GetNumVideoDisplays(); ++displayIdx) { for (int i = 0; i < SDL_GetNumDisplayModes(displayIdx); ++i) { SDL_DisplayMode mode; - if (SDL_GetDisplayMode(displayIdx, i, &mode) == -1) + if (SDL_GetDisplayMode(displayIdx, i, &mode) == -1) { continue; - if ((mode.w < 640) || (mode.h < 480)) - continue; // sane lower limit. - pair resolution(mode.w, mode.h); + } + if ((mode.w < 640) || (mode.h < 480)) { + continue; // sane lower limit. + } + pair resolution(mode.w, mode.h); resolutions.insert(resolution); } } @@ -291,10 +222,10 @@ bool SetUp () return false; } - if (cmdline("showresolutions")) { + if (commandLineOptions[SHOWRESOLUTIONS]) { printf("Available resolutions:\n"); for (auto resolution = resolutions.begin(); resolution != resolutions.end(); resolution++) { - printf(" %d x %d\n", (int) resolution->first, (int) resolution->second); + printf(" %d x %d\n", (int)resolution->first, (int)resolution->second); } } @@ -302,12 +233,15 @@ bool SetUp () SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1); Uint32 sdlflags = SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN; - if ((fullscreen || cmdline("fullscreen")) && !cmdline("windowed")) { - fullscreen = 1; + if (commandLineOptions[FULLSCREEN]) { + fullscreen = commandLineOptions[FULLSCREEN].last()->type(); + } + if (fullscreen) { sdlflags |= SDL_WINDOW_FULLSCREEN; } - if (!cmdline("nomousegrab")) + if (!commandLineOptions[NOMOUSEGRAB].last()->type()) { sdlflags |= SDL_WINDOW_INPUT_GRABBED; + } sdlwindow = SDL_CreateWindow("Lugaru", SDL_WINDOWPOS_CENTERED_DISPLAY(0), SDL_WINDOWPOS_CENTERED_DISPLAY(0), kContextWidth, kContextHeight, sdlflags); @@ -342,26 +276,21 @@ bool SetUp () SDL_GL_MakeCurrent(sdlwindow, glctx); - if (!lookup_all_glsyms()) { - fprintf(stderr, "Missing required OpenGL functions.\n"); - SDL_Quit(); - return false; - } - int dblbuf = 0; - if ((SDL_GL_GetAttribute(SDL_GL_DOUBLEBUFFER, &dblbuf) == -1) || (!dblbuf)) - { + if ((SDL_GL_GetAttribute(SDL_GL_DOUBLEBUFFER, &dblbuf) == -1) || (!dblbuf)) { fprintf(stderr, "Failed to get a double-buffered context.\n"); SDL_Quit(); return false; } - if (SDL_GL_SetSwapInterval(-1) == -1) // try swap_tear first. + if (SDL_GL_SetSwapInterval(-1) == -1) { // try swap_tear first. SDL_GL_SetSwapInterval(1); + } SDL_ShowCursor(0); - if (!cmdline("nomousegrab")) + if (!commandLineOptions[NOMOUSEGRAB].last()->type()) { SDL_SetRelativeMouseMode(SDL_TRUE); + } initGL(); @@ -377,7 +306,7 @@ bool SetUp () newscreenheight = screenheight; /* If saved resolution is not in the list, add it to the list (so that it’s selectable in the options) */ - pair startresolution(width,height); + pair startresolution(width, height); if (resolutions.find(startresolution) == resolutions.end()) { resolutions.insert(startresolution); } @@ -387,55 +316,60 @@ bool SetUp () return true; } - static void DoMouse() { - if (mainmenu || ( (abs(deltah) < 10 * realmultiplier * 1000) && (abs(deltav) < 10 * realmultiplier * 1000) )) { + if (mainmenu || ((abs(deltah) < 10 * realmultiplier * 1000) && (abs(deltav) < 10 * realmultiplier * 1000))) { deltah *= usermousesensitivity; deltav *= usermousesensitivity; mousecoordh += deltah; mousecoordv += deltav; - if (mousecoordh < 0) + if (mousecoordh < 0) { mousecoordh = 0; - else if (mousecoordh >= kContextWidth) + } else if (mousecoordh >= kContextWidth) { mousecoordh = kContextWidth - 1; - if (mousecoordv < 0) + } + if (mousecoordv < 0) { mousecoordv = 0; - else if (mousecoordv >= kContextHeight) + } else if (mousecoordv >= kContextHeight) { mousecoordv = kContextHeight - 1; + } } - } -void DoFrameRate (int update) +void DoFrameRate(int update) { static long frames = 0; - static AbsoluteTime time = {0, 0}; - static AbsoluteTime frametime = {0, 0}; - AbsoluteTime currTime = UpTime (); - double deltaTime = (float) AbsoluteDeltaToDuration (currTime, frametime); + static AbsoluteTime time = { 0, 0 }; + static AbsoluteTime frametime = { 0, 0 }; + AbsoluteTime currTime = UpTime(); + double deltaTime = (float)AbsoluteDeltaToDuration(currTime, frametime); - if (0 > deltaTime) // if negative microseconds + if (0 > deltaTime) { // if negative microseconds deltaTime /= -1000000.0; - else // else milliseconds + } else { // else milliseconds deltaTime /= 1000.0; + } multiplier = deltaTime; - if (multiplier < .001) + if (multiplier < .001) { multiplier = .001; - if (multiplier > 10) + } + if (multiplier > 10) { multiplier = 10; - if (update) + } + if (update) { frametime = currTime; // reset for next time interval + } - deltaTime = (float) AbsoluteDeltaToDuration (currTime, time); + deltaTime = (float)AbsoluteDeltaToDuration(currTime, time); - if (0 > deltaTime) // if negative microseconds + if (0 > deltaTime) { // if negative microseconds deltaTime /= -1000000.0; - else // else milliseconds + } else { // else milliseconds deltaTime /= 1000.0; + } frames++; if (0.001 <= deltaTime) { // has update interval passed if (update) { @@ -445,34 +379,39 @@ void DoFrameRate (int update) } } - -void DoUpdate () +void DoUpdate() { static float sps = 200; static int count; static float oldmult; DoFrameRate(1); - if (multiplier > .6) + if (multiplier > .6) { multiplier = .6; + } fps = 1 / multiplier; count = multiplier * sps; - if (count < 2) + if (count < 2) { count = 2; + } realmultiplier = multiplier; multiplier *= gamespeed; - if (difficulty == 1) + if (difficulty == 1) { multiplier *= .9; - if (difficulty == 0) + } + if (difficulty == 0) { multiplier *= .8; + } - if (loading == 4) + if (loading == 4) { multiplier *= .00001; - if (slomo && !mainmenu) + } + if (slomo && !mainmenu) { multiplier *= slomospeed; + } oldmult = multiplier; multiplier /= (float)count; @@ -520,7 +459,7 @@ void DoUpdate () num_channels = 0; } */ - if ( stereomode == stereoNone ) { + if (stereomode == stereoNone) { DrawGLScene(stereoCenter); } else { DrawGLScene(stereoLeft); @@ -530,21 +469,13 @@ void DoUpdate () // -------------------------------------------------------------------------- - -void CleanUp (void) +void CleanUp(void) { LOGFUNC; - SDL_Quit(); -#ifndef __MINGW32__ // FIXME: Temporary workaround for GL-8 -#define GL_FUNC(ret,fn,params,call,rt) p##fn = NULL; -#include "glstubs.h" -#undef GL_FUNC - // cheat here...static destructors are calling glDeleteTexture() after - // the context is destroyed and libGL unloaded by SDL_Quit(). - pglDeleteTextures = glDeleteTextures_doNothing; -#endif // __MINGW32__ + delete[] commandLineOptionsBuffer; + SDL_Quit(); } // -------------------------------------------------------------------------- @@ -554,30 +485,29 @@ static bool IsFocused() return ((SDL_GetWindowFlags(sdlwindow) & SDL_WINDOW_INPUT_FOCUS) != 0); } - - #ifndef WIN32 // (code lifted from physfs: http://icculus.org/physfs/ ... zlib license.) -static char *findBinaryInPath(const char *bin, char *envr) +static char* findBinaryInPath(const char* bin, char* envr) { size_t alloc_size = 0; - char *exe = NULL; - char *start = envr; - char *ptr; + char* exe = NULL; + char* start = envr; + char* ptr; do { size_t size; - ptr = strchr(start, ':'); /* find next $PATH separator. */ - if (ptr) + ptr = strchr(start, ':'); /* find next $PATH separator. */ + if (ptr) { *ptr = '\0'; - + } size = strlen(start) + strlen(bin) + 2; if (size > alloc_size) { - char *x = (char *) realloc(exe, size); + char* x = (char*)realloc(exe, size); if (x == NULL) { - if (exe != NULL) + if (exe != NULL) { free(exe); - return(NULL); + } + return (NULL); } /* if */ alloc_size = size; @@ -586,90 +516,166 @@ static char *findBinaryInPath(const char *bin, char *envr) /* build full binary path... */ strcpy(exe, start); - if ((exe[0] == '\0') || (exe[strlen(exe) - 1] != '/')) + if ((exe[0] == '\0') || (exe[strlen(exe) - 1] != '/')) { strcat(exe, "/"); + } strcat(exe, bin); if (access(exe, X_OK) == 0) { /* Exists as executable? We're done. */ - strcpy(exe, start); /* i'm lazy. piss off. */ - return(exe); + strcpy(exe, start); /* i'm lazy. piss off. */ + return (exe); } /* if */ - start = ptr + 1; /* start points to beginning of next element. */ + start = ptr + 1; /* start points to beginning of next element. */ } while (ptr != NULL); - if (exe != NULL) + if (exe != NULL) { free(exe); + } - return(NULL); /* doesn't exist in path. */ + return (NULL); /* doesn't exist in path. */ } /* findBinaryInPath */ - -char *calcBaseDir(const char *argv0) +char* calcBaseDir(const char* argv0) { /* If there isn't a path on argv0, then look through the $PATH for it. */ - char *retval; - char *envr; + char* retval; + char* envr; if (strchr(argv0, '/')) { retval = strdup(argv0); - if (retval) - *((char *) strrchr(retval, '/')) = '\0'; - return(retval); + if (retval) { + *((char*)strrchr(retval, '/')) = '\0'; + } + return (retval); } envr = getenv("PATH"); - if (!envr) + if (!envr) { return NULL; + } envr = strdup(envr); - if (!envr) + if (!envr) { return NULL; + } retval = findBinaryInPath(argv0, envr); free(envr); - return(retval); + return (retval); } -static inline void chdirToAppPath(const char *argv0) +static inline void chdirToAppPath(const char* argv0) { - char *dir = calcBaseDir(argv0); + char* dir = calcBaseDir(argv0); if (dir) { #if (defined(__APPLE__) && defined(__MACH__)) // Chop off /Contents/MacOS if it's at the end of the string, so we // land in the base of the app bundle. const size_t len = strlen(dir); - const char *bundledirs = "/Contents/MacOS"; + const char* bundledirs = "/Contents/MacOS"; const size_t bundledirslen = strlen(bundledirs); if (len > bundledirslen) { - char *ptr = (dir + len) - bundledirslen; + char* ptr = (dir + len) - bundledirslen; if (strcasecmp(ptr, bundledirs) == 0) *ptr = '\0'; } #endif - chdir(dir); + errno = 0; + if (chdir(dir) != 0) { + printf("Error changing dir to '%s' (%s).\n", dir, strerror(errno)); + } free(dir); } } #endif - -int main(int argc, char **argv) +const option::Descriptor usage[] = + { + { UNKNOWN, 0, "", "", option::Arg::None, "USAGE: lugaru [options]\n\n" + "Options:" }, + { VERSION, 0, "v", "version", option::Arg::None, " -v, --version Print version and exit." }, + { HELP, 0, "h", "help", option::Arg::None, " -h, --help Print usage and exit." }, + { FULLSCREEN, 1, "f", "fullscreen", option::Arg::None, " -f, --fullscreen Start the game in fullscreen mode." }, + { FULLSCREEN, 0, "w", "windowed", option::Arg::None, " -w, --windowed Start the game in windowed mode (default)." }, + { NOMOUSEGRAB, 1, "", "nomousegrab", option::Arg::None, " --nomousegrab Disable mousegrab." }, + { NOMOUSEGRAB, 0, "", "mousegrab", option::Arg::None, " --mousegrab Enable mousegrab (default)." }, + { SOUND, 1, "", "nosound", option::Arg::None, " --nosound Disable sound." }, + { 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 Enable dev tools: console, level editor and debug info." }, + { 0, 0, 0, 0, 0, 0 } + }; + +option::Option commandLineOptions[commandLineOptionsNumber]; +option::Option* commandLineOptionsBuffer; + +int main(int argc, char** argv) { - _argc = argc; - _argv = argv; + argc -= (argc > 0); + argv += (argc > 0); // skip program name argv[0] if present + option::Stats stats(true, usage, argc, argv); + if (commandLineOptionsNumber != stats.options_max) { + std::cerr << "Found incorrect command line option number" << std::endl; + return 1; + } + commandLineOptionsBuffer = new option::Option[stats.buffer_max]; + option::Parser parse(true, usage, argc, argv, commandLineOptions, commandLineOptionsBuffer); + + if (parse.error()) { + delete[] commandLineOptionsBuffer; + return 1; + } + + // Always start by printing the version and info to the stdout + std::cout << "--------------------------------------------------------------------------\n" + << "Lugaru HD: The Rabbit's Foot, by Wolfire Games and the OSS Lugaru project.\n\n" + << "Licensed under the GPL 2.0+ and CC-BY-SA 3.0 and 4.0 licenses.\n" + << "More information, updates and bug reports at http://osslugaru.gitlab.io\n" + << std::endl; + + std::cout << "Version " + VERSION_STRING + " -- " + VERSION_BUILD_TYPE + " build\n" + << "--------------------------------------------------------------------------\n" + << std::endl; + + if (commandLineOptions[VERSION]) { + // That was enough, quit. + delete[] commandLineOptionsBuffer; + return 0; + } + + if (commandLineOptions[HELP]) { + option::printUsage(std::cout, usage); + delete[] commandLineOptionsBuffer; + return 0; + } + + if (option::Option* opt = commandLineOptions[UNKNOWN]) { + std::cerr << "Unknown option: " << opt->name << "\n"; + option::printUsage(std::cerr, usage); + delete[] commandLineOptionsBuffer; + return 1; + } - // !!! FIXME: we could use a Win32 API for this. --ryan. +// !!! FIXME: we could use a Win32 API for this. --ryan. #ifndef WIN32 chdirToAppPath(argv[0]); #endif LOGFUNC; +#ifdef NDEBUG try { +#endif { newGame(); - if (!SetUp ()) + if (!SetUp()) { + delete[] commandLineOptionsBuffer; return 42; + } + + if (commandLineOptions[DEVTOOLS]) { + devtools = true; + } bool gameDone = false; bool gameFocused = true; @@ -685,7 +691,7 @@ int main(int argc, char **argv) SDL_Event e; if (!waiting) { // message pump - while ( SDL_PollEvent( &e ) ) { + while (SDL_PollEvent(&e)) { if (!sdlEventProc(e)) { gameDone = true; break; @@ -710,9 +716,10 @@ int main(int argc, char **argv) deleteGame(); } - CleanUp (); + CleanUp(); return 0; +#ifdef NDEBUG } catch (const std::exception& error) { CleanUp(); @@ -721,8 +728,9 @@ int main(int argc, char **argv) LOG(e); - MessageBox(g_windowHandle, error.what(), "ERROR", MB_OK | MB_ICONEXCLAMATION); + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Exception catched", error.what(), NULL); return -1; } +#endif }