From f45baa9fe67cc3e9152fec0b7a6e0bd9fe2b4637 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 25 Apr 2003 05:43:48 +0000 Subject: [PATCH] Always use SDL_INIT_NOPARACHUTE. --- stepmania/src/StepMania.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index e577708b0c..03b3c43f8b 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -235,6 +235,7 @@ int main(int argc, char* argv[]) /* Set this up second. Do this early, since it's needed for RageException::Throw. * Do it after ChangeToDirOfExecutable, so the log ends up in the right place. */ LOG = new RageLog(); + #ifdef DEBUG LOG->ShowConsole(); #endif @@ -243,12 +244,9 @@ int main(int argc, char* argv[]) atexit(SDL_Quit); /* Clean up on exit */ - /* Fire up the SDL, but don't actually start any subsystems. */ - int SDL_flags = 0; -#ifdef WIN32 - /* We use our own error handler in Windows. */ - SDL_flags |= SDL_INIT_NOPARACHUTE; -#endif + /* Fire up the SDL, but don't actually start any subsystems. + * We use our own error handlers. */ + int SDL_flags = SDL_INIT_NOPARACHUTE; SDL_Init(SDL_flags); CString g_sErrorString = ""; @@ -328,7 +326,7 @@ int main(int argc, char* argv[]) /* This initializes objects that change the SDL event mask, and has other * dependencies on the SDL video subsystem, so it must be initialized after * DISPLAY and setting the default SDL event mask. */ - INPUTMAN = new RageInput(); + INPUTMAN = new RageInput; // These things depend on the TextureManager, so do them after! FONT = new FontManager;