mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-15 12:54:01 +02:00
Code Issues Projects Releases Wiki Activity

- modified the following commands so they don't required SDL video mode:

Browse Source 
--help
--version
--show-ini-settings
This commit is contained in:
Mark Vejvoda
2011-09-28 07:04:42 +00:00
parent aed293bba2
commit a3bf4bfe32
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/shared_lib/include/platform/sdl/platform_main.h
View File

@@ -265,19 +265,22 @@ bool hasCommandArgument(int argc, char** argv,const string argName, int *foundIn
return result; return result;
} }
#define MAIN_FUNCTION(X) int main(int argc, char **argv) \ #define MAIN_FUNCTION(X) int main(int argc, char **argv) \
{ \ { \
if(hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_MASTERSERVER_MODE])) == true) { \ if(hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_HELP])) == true || \
if(SDL_Init(SDL_INIT_TIMER | SDL_INIT_JOYSTICK) < 0) { \ hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_VERSION])) == true || \
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n"; \ hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_SHOW_INI_SETTINGS])) == true || \
return 1; \ hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_MASTERSERVER_MODE])) == true) { \
} \ if(SDL_Init(SDL_INIT_TIMER | SDL_INIT_JOYSTICK) < 0) { \
} \ std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n"; \
else { \ return 1; \
if(SDL_Init(SDL_INIT_EVERYTHING) < 0) { \ } \
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n"; \ } \
return 1; \ else { \
} \ if(SDL_Init(SDL_INIT_EVERYTHING) < 0) { \
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n"; \
return 1; \
} \
} \ } \
SDL_EnableUNICODE(1); \ SDL_EnableUNICODE(1); \
int result = X(argc, argv); \ int result = X(argc, argv); \