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

--help
--version
--show-ini-settings
This commit is contained in:
Mark Vejvoda 2011-09-28 07:04:42 +00:00
parent aed293bba2
commit a3bf4bfe32

View File

@ -267,7 +267,10 @@ bool hasCommandArgument(int argc, char** argv,const string argName, int *foundIn
#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 || \
hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_VERSION])) == true || \
hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_SHOW_INI_SETTINGS])) == true || \
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"; \
return 1; \