Skip to content
Snippets Groups Projects
Commit 3944e95e authored by deuce's avatar deuce
Browse files

Clean up initialization a bit.

parent 128fe364
No related branches found
No related tags found
No related merge requests found
...@@ -455,7 +455,6 @@ int SDL_main_env(int argc, char **argv, char **env) ...@@ -455,7 +455,6 @@ int SDL_main_env(int argc, char **argv, char **env)
WinExec(GetCommandLine(), SW_SHOWDEFAULT); WinExec(GetCommandLine(), SW_SHOWDEFAULT);
exit(0); exit(0);
} }
sdl.gotfuncs=FALSE;
/* Sure ,we can't use video, but audio is still valid! */ /* Sure ,we can't use video, but audio is still valid! */
if(sdl.Init(0)==0) if(sdl.Init(0)==0)
sdl_initialized=TRUE; sdl_initialized=TRUE;
...@@ -477,21 +476,22 @@ int SDL_main_env(int argc, char **argv, char **env) ...@@ -477,21 +476,22 @@ int SDL_main_env(int argc, char **argv, char **env)
/* Sure ,we can't use video, but audio is still valid! */ /* Sure ,we can't use video, but audio is still valid! */
if(sdl.Init(0)==0) if(sdl.Init(0)==0)
sdl_initialized=TRUE; sdl_initialized=TRUE;
sdl.gotfuncs=FALSE;
} }
else { else {
if(sdl.Init(SDL_INIT_VIDEO)) if(sdl.Init(SDL_INIT_VIDEO)==0)
sdl.gotfuncs=FALSE;
else {
sdl_initialized=TRUE; sdl_initialized=TRUE;
sdl_video_initialized=TRUE; sdl_video_initialized=TRUE;
} }
else {
/* Sure ,we can't use video, but audio is still valid! */
if(sdl.Init(0)==0)
sdl_initialized=TRUE;
}
} }
#endif #endif
if(sdl_video_initialized && sdl.VideoDriverName(drivername, sizeof(drivername))!=NULL) { if(sdl_video_initialized && sdl.VideoDriverName(drivername, sizeof(drivername))!=NULL) {
/* Unacceptable drivers */ /* Unacceptable drivers */
if((!strcmp(drivername, "caca")) || (!strcmp(drivername,"aalib")) || (!strcmp(drivername,"dummy"))) { if((!strcmp(drivername, "caca")) || (!strcmp(drivername,"aalib")) || (!strcmp(drivername,"dummy"))) {
sdl.gotfuncs=FALSE;
sdl.QuitSubSystem(SDL_INIT_VIDEO); sdl.QuitSubSystem(SDL_INIT_VIDEO);
sdl_video_initialized=FALSE; sdl_video_initialized=FALSE;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment