jetomit/avp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

main.c: switched to using atexit instead of calling SDL_Quit directly.

Browse source 
npcsetup.cpp: removed old todo msg
This commit is contained in:
Steven Fuller 2002-01-13 16:06:33 +00:00 • committed by Patryk Obara
parent ec12e751c0
commit 47d9cc1b2c
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/avp/win95/npcsetup.cpp
View file

@ -13,8 +13,6 @@
#include "avp_menus.h" #include "avp_menus.h"
/* TODO: dir separator */
#if ALIEN_DEMO #if ALIEN_DEMO
#define DIRECTORY_FOR_RIFS "alienavp_huds/" #define DIRECTORY_FOR_RIFS "alienavp_huds/"
#else #else
@ -321,10 +319,9 @@ void InitNPCs(RIFFHANDLE h)
DefaultGeneratorEnemy=HNPC_Marine; DefaultGeneratorEnemy=HNPC_Marine;
break; break;
default : default :
DefaultGeneratorEnemy=HNPC_Marine;
GLOBALASSERT("Invalid enemy type"==0); GLOBALASSERT("Invalid enemy type"==0);
} }
} }
else else
{ {

11
src/main.c
View file

@ -305,6 +305,8 @@ int InitSDL()
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
atexit(SDL_Quit);
SDL_AvailableVideoModes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_OPENGL); SDL_AvailableVideoModes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_OPENGL);
if (SDL_AvailableVideoModes == NULL) if (SDL_AvailableVideoModes == NULL)
return -1; return -1;
@ -393,7 +395,7 @@ int SetSoftVideoMode(int Width, int Height, int Depth)
if ((surface = SDL_SetVideoMode(Width, Height, Depth, flags)) == NULL) { if ((surface = SDL_SetVideoMode(Width, Height, Depth, flags)) == NULL) {
fprintf(stderr, "(Software) SDL SetVideoMode failed: %s\n", SDL_GetError()); fprintf(stderr, "(Software) SDL SetVideoMode failed: %s\n", SDL_GetError());
SDL_Quit(); /* SDL_Quit(); */
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -454,7 +456,7 @@ int SetOGLVideoMode(int Width, int Height)
if ((surface = SDL_SetVideoMode(Width, Height, 0, flags)) == NULL) { if ((surface = SDL_SetVideoMode(Width, Height, 0, flags)) == NULL) {
fprintf(stderr, "(OpenGL) SDL SetVideoMode failed: %s\n", SDL_GetError()); fprintf(stderr, "(OpenGL) SDL SetVideoMode failed: %s\n", SDL_GetError());
SDL_Quit(); /* SDL_Quit(); */
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -547,7 +549,10 @@ int ExitWindowsSystem()
SDL_JoystickClose(joy); SDL_JoystickClose(joy);
} }
#endif #endif
SDL_Quit(); /* SDL_Quit(); */
if (surface)
SDL_FreeSurface(surface);
surface = NULL;
return 0; return 0;
} }