X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsetup.cpp;h=ffd9e3f188451c2b632687184273bb1e61e2c117;hb=8649bd473126548ff289351cb425beddb29f4e07;hp=dc79fd069c7cd0df834c6d937a0e19a06bbe9258;hpb=08a697dcba687557de6dce27a1736edc75ce48d3;p=supertux.git diff --git a/src/setup.cpp b/src/setup.cpp index dc79fd069..ffd9e3f18 100644 --- a/src/setup.cpp +++ b/src/setup.cpp @@ -11,6 +11,7 @@ */ #include +#include #include #include #include @@ -22,14 +23,13 @@ #include #endif -#ifndef WIN32 -#include #include #include #include +#ifndef WIN32 #include -#include #endif +#include #include "defines.h" #include "globals.h" @@ -38,6 +38,15 @@ #include "texture.h" #include "menu.h" #include "gameloop.h" +#include "configfile.h" +#include "scene.h" + +#ifdef WIN32 +#define mkdir(dir, mode) mkdir(dir) +// on win32 we typically don't want LFS paths +#undef DATA_PREFIX +#define DATA_PREFIX "./data/" +#endif /* Local function prototypes: */ @@ -50,14 +59,14 @@ int faccessible(const char *filename) struct stat filestat; if (stat(filename, &filestat) == -1) { - return NO; + return false; } else { if(S_ISREG(filestat.st_mode)) - return YES; + return true; else - return NO; + return false; } } @@ -68,34 +77,64 @@ int fwriteable(const char *filename) fi = fopen(filename, "wa"); if (fi == NULL) { - return NO; + return false; } - return YES; + return true; } -/* Makes sure a directory is created in either the SuperTux base directory or the SuperTux base directory.*/ +/* Makes sure a directory is created in either the SuperTux home directory or the SuperTux base directory.*/ int fcreatedir(const char* relative_dir) { char path[1024]; snprintf(path, 1024, "%s/%s/", st_dir, relative_dir); if(mkdir(path,0755) != 0) { - snprintf(path, 1024, "%s/%s/", DATA_PREFIX, relative_dir); + snprintf(path, 1024, "%s/%s/", datadir.c_str(), relative_dir); if(mkdir(path,0755) != 0) { - return NO; + return false; } else { - return YES; + return true; } } else { - return YES; + return true; } } +FILE * opendata(const char * rel_filename, const char * mode) +{ + char * filename = NULL; + FILE * fi; + + filename = (char *) malloc(sizeof(char) * (strlen(st_dir) + + strlen(rel_filename) + 1)); + + strcpy(filename, st_dir); + /* Open the high score file: */ + + strcat(filename, rel_filename); + + /* Try opening the file: */ + fi = fopen(filename, mode); + + if (fi == NULL) + { + fprintf(stderr, "Warning: Unable to open the file \"%s\" ", filename); + + if (strcmp(mode, "r") == 0) + fprintf(stderr, "for read!!!\n"); + else if (strcmp(mode, "w") == 0) + fprintf(stderr, "for write!!!\n"); + } + free( filename ); + + return(fi); +} + /* Get all names of sub-directories in a certain directory. */ /* Returns the number of sub-directories found. */ /* Note: The user has to free the allocated space. */ @@ -133,7 +172,7 @@ string_list_type dsubdirs(const char *rel_path,const char* expected_file) closedir(dirStructP); } - sprintf(path,"%s/%s",DATA_PREFIX,rel_path); + sprintf(path,"%s/%s",datadir.c_str(),rel_path); if((dirStructP = opendir(path)) != NULL) { while((direntp = readdir(dirStructP)) != NULL) @@ -204,7 +243,7 @@ string_list_type dfiles(const char *rel_path, const char* glob, const char* ex closedir(dirStructP); } - sprintf(path,"%s/%s",DATA_PREFIX,rel_path); + sprintf(path,"%s/%s",datadir.c_str(),rel_path); if((dirStructP = opendir(path)) != NULL) { while((direntp = readdir(dirStructP)) != NULL) @@ -272,27 +311,22 @@ void st_directory_setup(void) strcat(st_save_dir,"/save"); /* Create them. In the case they exist they won't destroy anything. */ -#ifndef WIN32 mkdir(st_dir, 0755); mkdir(st_save_dir, 0755); sprintf(str, "%s/levels", st_dir); mkdir(str, 0755); -#else - mkdir(st_dir); - mkdir(st_save_dir); - sprintf(str, "%s/levels", st_dir); - mkdir(str); -#endif // User has not that a datadir, so we try some magic if (datadir.empty()) { +#ifndef WIN32 // Detect datadir char exe_file[PATH_MAX]; if (readlink("/proc/self/exe", exe_file, PATH_MAX) < 0) { puts("Couldn't read /proc/self/exe, using default path: " DATA_PREFIX); + datadir = DATA_PREFIX; } else { @@ -308,6 +342,9 @@ void st_directory_setup(void) } } } +#else + datadir = DATA_PREFIX; +#endif } printf("Datadir: %s\n", datadir.c_str()); } @@ -315,148 +352,201 @@ void st_directory_setup(void) /* Create and setup menus. */ void st_menu(void) { - menu_init(&main_menu); - menu_additem(&main_menu,menu_item_create(MN_LABEL,"Main Menu",0,0)); - menu_additem(&main_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&main_menu,menu_item_create(MN_ACTION,"Start Game",0,0)); - menu_additem(&main_menu,menu_item_create(MN_GOTO,"Load Game",0,&load_game_menu)); - menu_additem(&main_menu,menu_item_create(MN_GOTO,"Options",0,&options_menu)); - menu_additem(&main_menu,menu_item_create(MN_ACTION,"Level editor",0,0)); - menu_additem(&main_menu,menu_item_create(MN_ACTION,"Credits",0,0)); - menu_additem(&main_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&main_menu,menu_item_create(MN_ACTION,"Quit",0,0)); - - menu_init(&options_menu); - menu_additem(&options_menu,menu_item_create(MN_LABEL,"Options",0,0)); - menu_additem(&options_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&options_menu,menu_item_create(MN_TOGGLE,"Fullscreen",use_fullscreen,0)); - if(audio_device == YES) + main_menu = new Menu(); + options_menu = new Menu(); + options_controls_menu = new Menu(); + load_game_menu = new Menu(); + save_game_menu = new Menu(); + game_menu = new Menu(); + highscore_menu = new Menu(); + contrib_menu = new Menu(); + contrib_subset_menu = new Menu(); + worldmap_menu = new Menu(); + + main_menu->set_pos(screen->w/2, 335); + main_menu->additem(MN_GOTO, "Start Game",0,load_game_menu); + main_menu->additem(MN_GOTO, "Contrib Levels",0,contrib_menu); + main_menu->additem(MN_GOTO, "Options",0,options_menu); + main_menu->additem(MN_ACTION,"Level editor",0,0); + main_menu->additem(MN_ACTION,"Credits",0,0); + main_menu->additem(MN_ACTION,"Quit",0,0); + + options_menu->additem(MN_LABEL,"Options",0,0); + options_menu->additem(MN_HL,"",0,0); +#ifndef NOOPENGL + options_menu->additem(MN_TOGGLE,"OpenGL",use_gl,0); +#else + options_menu->additem(MN_DEACTIVE,"OpenGL (not supported)",use_gl,0); +#endif + options_menu->additem(MN_TOGGLE,"Fullscreen",use_fullscreen,0); + if(audio_device) { - menu_additem(&options_menu,menu_item_create(MN_TOGGLE,"Sound ",use_sound,0)); - menu_additem(&options_menu,menu_item_create(MN_TOGGLE,"Music ",use_music,0)); + options_menu->additem(MN_TOGGLE,"Sound ",use_sound,0); + options_menu->additem(MN_TOGGLE,"Music ",use_music,0); } else { - menu_additem(&options_menu,menu_item_create(MN_DEACTIVE,"Sound ",use_sound,0)); - menu_additem(&options_menu,menu_item_create(MN_DEACTIVE,"Music ",use_music,0)); + options_menu->additem(MN_DEACTIVE,"Sound ",use_sound,0); + options_menu->additem(MN_DEACTIVE,"Music ",use_music,0); } - menu_additem(&options_menu,menu_item_create(MN_TOGGLE,"Show FPS ",show_fps,0)); - menu_additem(&options_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&options_menu,menu_item_create(MN_BACK,"Back",0,0)); - - menu_init(&load_game_menu); - menu_additem(&load_game_menu,menu_item_create(MN_LABEL,"Load Game",0,0)); - menu_additem(&load_game_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&load_game_menu,menu_item_create(MN_DEACTIVE,"Slot 1",0,0)); - menu_additem(&load_game_menu,menu_item_create(MN_DEACTIVE,"Slot 2",0,0)); - menu_additem(&load_game_menu,menu_item_create(MN_DEACTIVE,"Slot 3",0,0)); - menu_additem(&load_game_menu,menu_item_create(MN_DEACTIVE,"Slot 4",0,0)); - menu_additem(&load_game_menu,menu_item_create(MN_DEACTIVE,"Slot 5",0,0)); - menu_additem(&load_game_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&load_game_menu,menu_item_create(MN_BACK,"Back",0,0)); - - menu_init(&save_game_menu); - menu_additem(&save_game_menu,menu_item_create(MN_LABEL,"Save Game",0,0)); - menu_additem(&save_game_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&save_game_menu,menu_item_create(MN_DEACTIVE,"Slot 1",0,0)); - menu_additem(&save_game_menu,menu_item_create(MN_DEACTIVE,"Slot 2",0,0)); - menu_additem(&save_game_menu,menu_item_create(MN_DEACTIVE,"Slot 3",0,0)); - menu_additem(&save_game_menu,menu_item_create(MN_DEACTIVE,"Slot 4",0,0)); - menu_additem(&save_game_menu,menu_item_create(MN_DEACTIVE,"Slot 5",0,0)); - menu_additem(&save_game_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&save_game_menu,menu_item_create(MN_BACK,"Back",0,0)); - - menu_init(&game_menu); - menu_additem(&game_menu,menu_item_create(MN_LABEL,"InGame Menu",0,0)); - menu_additem(&game_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&game_menu,menu_item_create(MN_ACTION,"Return To Game",0,0)); - menu_additem(&game_menu,menu_item_create(MN_GOTO,"Save Game",0,&save_game_menu)); - menu_additem(&game_menu,menu_item_create(MN_GOTO,"Load Game",0,&load_game_menu)); - menu_additem(&game_menu,menu_item_create(MN_GOTO,"Options",0,&options_menu)); - menu_additem(&game_menu,menu_item_create(MN_HL,"",0,0)); - menu_additem(&game_menu,menu_item_create(MN_ACTION,"Quit Game",0,0)); - - menu_init(&highscore_menu); - menu_additem(&highscore_menu,menu_item_create(MN_TEXTFIELD,"Enter your name:",0,0)); - + options_menu->additem(MN_TOGGLE,"Show FPS ",show_fps,0); + options_menu->additem(MN_GOTO,"Controls ",0,options_controls_menu); + options_menu->additem(MN_HL,"",0,0); + options_menu->additem(MN_BACK,"Back",0,0); + + options_controls_menu->additem(MN_LABEL,"Controls",0,0); + options_controls_menu->additem(MN_HL,"",0,0); + //FIXME:options_controls_menu->additem(MN_CONTROLFIELD,"Move Right", tux.keymap.right,0); + options_controls_menu->additem(MN_HL,"",0,0); + options_controls_menu->additem(MN_BACK,"Back",0,0); + + load_game_menu->additem(MN_LABEL,"Start Game",0,0); + load_game_menu->additem(MN_HL,"",0,0); + load_game_menu->additem(MN_DEACTIVE,"Slot 1",0,0); + load_game_menu->additem(MN_DEACTIVE,"Slot 2",0,0); + load_game_menu->additem(MN_DEACTIVE,"Slot 3",0,0); + load_game_menu->additem(MN_DEACTIVE,"Slot 4",0,0); + load_game_menu->additem(MN_DEACTIVE,"Slot 5",0,0); + load_game_menu->additem(MN_HL,"",0,0); + load_game_menu->additem(MN_BACK,"Back",0,0); + + save_game_menu->additem(MN_LABEL,"Save Game",0,0); + save_game_menu->additem(MN_HL,"",0,0); + save_game_menu->additem(MN_DEACTIVE,"Slot 1",0,0); + save_game_menu->additem(MN_DEACTIVE,"Slot 2",0,0); + save_game_menu->additem(MN_DEACTIVE,"Slot 3",0,0); + save_game_menu->additem(MN_DEACTIVE,"Slot 4",0,0); + save_game_menu->additem(MN_DEACTIVE,"Slot 5",0,0); + save_game_menu->additem(MN_HL,"",0,0); + save_game_menu->additem(MN_BACK,"Back",0,0); + + game_menu->additem(MN_LABEL,"InGame Menu",0,0); + game_menu->additem(MN_HL,"",0,0); + game_menu->additem(MN_ACTION,"Return To Game",0,0); + game_menu->additem(MN_GOTO,"Save Game",0,save_game_menu); + game_menu->additem(MN_GOTO,"Load Game",0,load_game_menu); + game_menu->additem(MN_GOTO,"Options",0,options_menu); + game_menu->additem(MN_HL,"",0,0); + game_menu->additem(MN_ACTION,"Quit Game",0,0); + + worldmap_menu->additem(MN_LABEL,"Worldmap Menu",0,0); + worldmap_menu->additem(MN_HL,"",0,0); + worldmap_menu->additem(MN_ACTION,"Return To Game",0,0); + worldmap_menu->additem(MN_GOTO,"Options",0,options_menu); + worldmap_menu->additem(MN_HL,"",0,0); + worldmap_menu->additem(MN_ACTION,"Quit Game",0,0); + + highscore_menu->additem(MN_TEXTFIELD,"Enter your name:",0,0); } -void update_load_save_game_menu(menu_type* pmenu, int load) +void update_load_save_game_menu(Menu* pmenu, int load) { - int i; - - for(i = 2; i < 7; ++i) + for(int i = 2; i < 7; ++i) { - char *tmp; - slotinfo(&tmp,i-1); - if(load && strlen(tmp) == strlen("Slot X - Free") ) - pmenu->item[i].kind = MN_DEACTIVE; + // FIXME: Insert a real savegame struct/class here instead of + // doing string vodoo + std::string tmp = slotinfo(i-1); + + if(load && tmp.length() == strlen("Slot X - Free")) + pmenu->item[i].kind = MN_ACTION; else pmenu->item[i].kind = MN_ACTION; - menu_item_change_text(&pmenu->item[i],tmp); - free(tmp); + pmenu->item[i].change_text(tmp.c_str()); } } -void process_save_load_game_menu(int save) +void process_save_game_menu() +{ + int slot = save_game_menu->check(); + if (slot != -1) + GameSession::current()->savegame(slot - 1); +} + +bool process_load_game_menu() { - int slot; - switch (slot = menu_check(save ? &save_game_menu : &load_game_menu)) + int slot = load_game_menu->check(); + + if(slot != -1) { - default: - if(slot != -1) - { - if(save == YES) + // FIXME: Insert a real savegame struct/class here instead of + // doing string vodoo + std::string tmp = slotinfo(slot-1); + + if (tmp.length() == strlen("Slot X - Free")) + { // Slot is free, so start a new game + GameSession session("default", 1, ST_GL_PLAY); + session.run(); + + show_menu = true; + Menu::set_current(main_menu); + } + else + { + puts("Warning: Loading games isn't supported at the moment"); +#if 0 + // Slot contains a level, so load it + if (game_started) { - savegame(slot - 1); + GameSession session("default",slot - 1,ST_GL_LOAD_GAME); + session.run(); + + show_menu = true; + Menu::set_current(main_menu); } else { - if(game_started == NO) - { - gameloop("default",slot - 1,ST_GL_LOAD_GAME); - show_menu = YES; - menu_set_current(&main_menu); - } - else - loadgame(slot - 1); + //loadgame(slot - 1); } - st_pause_ticks_stop(); +#endif } - break; + st_pause_ticks_stop(); + return true; + } + else + { + return false; } } /* Handle changes made to global settings in the options menu. */ void process_options_menu(void) { - switch (menu_check(&options_menu)) + switch (options_menu->check()) { case 2: - if(use_fullscreen != options_menu.item[2].toggled) +#ifndef NOOPENGL + if(use_gl != options_menu->item[2].toggled) { - use_fullscreen = !use_fullscreen; + use_gl = !use_gl; st_video_setup(); } +#endif break; case 3: - if(use_sound != options_menu.item[3].toggled) - use_sound = !use_sound; + if(use_fullscreen != options_menu->item[3].toggled) + { + use_fullscreen = !use_fullscreen; + st_video_setup(); + } break; case 4: - if(use_music != options_menu.item[4].toggled) + if(use_sound != options_menu->item[4].toggled) + use_sound = !use_sound; + break; + case 5: + if(use_music != options_menu->item[5].toggled) { - if(use_music == YES) + if(use_music) { if(playing_music()) { halt_music(); } - use_music = NO; + use_music = false; } else { - use_music = YES; + use_music = true; if (!playing_music()) { play_current_music(); @@ -464,8 +554,8 @@ void process_options_menu(void) } } break; - case 5: - if(show_fps != options_menu.item[5].toggled) + case 6: + if(show_fps != options_menu->item[6].toggled) show_fps = !show_fps; break; } @@ -487,22 +577,25 @@ void st_general_setup(void) /* Load global images: */ - text_load(&black_text,DATA_PREFIX "/images/status/letters-black.png", TEXT_TEXT, 16,18); - text_load(&gold_text,DATA_PREFIX "/images/status/letters-gold.png", TEXT_TEXT, 16,18); - text_load(&blue_text,DATA_PREFIX "/images/status/letters-blue.png", TEXT_TEXT, 16,18); - text_load(&red_text,DATA_PREFIX "/images/status/letters-red.png", TEXT_TEXT, 16,18); - text_load(&white_text,DATA_PREFIX "/images/status/letters-white.png", TEXT_TEXT, 16,18); - text_load(&white_small_text,DATA_PREFIX "/images/status/letters-white-small.png", TEXT_TEXT, 8,9); - text_load(&white_big_text,DATA_PREFIX "/images/status/letters-white-big.png", TEXT_TEXT, 20,23); - text_load(&yellow_nums,DATA_PREFIX "/images/status/numbers.png", TEXT_NUM, 32,32); + black_text = new Text(datadir + "/images/status/letters-black.png", TEXT_TEXT, 16,18); + gold_text = new Text(datadir + "/images/status/letters-gold.png", TEXT_TEXT, 16,18); + blue_text = new Text(datadir + "/images/status/letters-blue.png", TEXT_TEXT, 16,18); + red_text = new Text(datadir + "/images/status/letters-red.png", TEXT_TEXT, 16,18); + white_text = new Text(datadir + "/images/status/letters-white.png", TEXT_TEXT, 16,18); + white_small_text = new Text(datadir + "/images/status/letters-white-small.png", TEXT_TEXT, 8,9); + white_big_text = new Text(datadir + "/images/status/letters-white-big.png", TEXT_TEXT, 20,23); + yellow_nums = new Text(datadir + "/images/status/numbers.png", TEXT_NUM, 32,32); /* Load GUI/menu images: */ - texture_load(&checkbox, DATA_PREFIX "/images/status/checkbox.png", USE_ALPHA); - texture_load(&checkbox_checked, DATA_PREFIX "/images/status/checkbox-checked.png", USE_ALPHA); - texture_load(&back, DATA_PREFIX "/images/status/back.png", USE_ALPHA); - texture_load(&arrow_left, DATA_PREFIX "/images/icons/left.png", USE_ALPHA); - texture_load(&arrow_right, DATA_PREFIX "/images/icons/right.png", USE_ALPHA); - + checkbox = new Surface(datadir + "/images/status/checkbox.png", USE_ALPHA); + checkbox_checked = new Surface(datadir + "/images/status/checkbox-checked.png", USE_ALPHA); + back = new Surface(datadir + "/images/status/back.png", USE_ALPHA); + arrow_left = new Surface(datadir + "/images/icons/left.png", USE_ALPHA); + arrow_right = new Surface(datadir + "/images/icons/right.png", USE_ALPHA); + + /* Load the mouse-cursor */ + mouse_cursor = new MouseCursor( datadir + "/images/status/mousecursor.png",1); + } void st_general_free(void) @@ -510,35 +603,35 @@ void st_general_free(void) /* Free global images: */ - text_free(&black_text); - text_free(&gold_text); - text_free(&white_text); - text_free(&blue_text); - text_free(&red_text); - text_free(&white_small_text); - text_free(&white_big_text); + delete black_text; + delete gold_text; + delete white_text; + delete blue_text; + delete red_text; + delete white_small_text; + delete white_big_text; /* Free GUI/menu images: */ - texture_free(&checkbox); - texture_free(&checkbox_checked); - texture_free(&back); - texture_free(&arrow_left); - texture_free(&arrow_right); - + delete checkbox; + delete checkbox_checked; + delete back; + delete arrow_left; + delete arrow_right; + + /* Free mouse-cursor */ + delete mouse_cursor; + /* Free menus */ - - menu_free(&main_menu); - menu_free(&game_menu); - menu_free(&options_menu); - menu_free(&highscore_menu); - menu_free(&save_game_menu); - menu_free(&load_game_menu); - + delete main_menu; + delete game_menu; + delete options_menu; + delete highscore_menu; + delete save_game_menu; + delete load_game_menu; } void st_video_setup(void) { - if(screen != NULL) SDL_FreeSurface(screen); @@ -554,25 +647,22 @@ void st_video_setup(void) } /* Open display: */ - if(use_gl) st_video_setup_gl(); else st_video_setup_sdl(); - texture_setup(); + Surface::reload_all(); /* Set window manager stuff: */ - - SDL_WM_SetCaption("Super Tux", "Super Tux"); - + SDL_WM_SetCaption("SuperTux " VERSION, "SuperTux"); } void st_video_setup_sdl(void) { SDL_FreeSurface(screen); - if (use_fullscreen == YES) + if (use_fullscreen) { screen = SDL_SetVideoMode(640, 480, 0, SDL_FULLSCREEN ) ; /* | SDL_HWSURFACE); */ if (screen == NULL) @@ -582,7 +672,7 @@ void st_video_setup_sdl(void) "640x480 mode.\n" "The Simple DirectMedia error that occured was:\n" "%s\n\n", SDL_GetError()); - use_fullscreen = NO; + use_fullscreen = false; } } else @@ -610,7 +700,7 @@ void st_video_setup_gl(void) SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); - if (use_fullscreen == YES) + if (use_fullscreen) { screen = SDL_SetVideoMode(640, 480, 0, SDL_FULLSCREEN | SDL_OPENGL) ; /* | SDL_HWSURFACE); */ if (screen == NULL) @@ -620,7 +710,7 @@ void st_video_setup_gl(void) "640x480 mode.\n" "The Simple DirectMedia error that occured was:\n" "%s\n\n", SDL_GetError()); - use_fullscreen = NO; + use_fullscreen = false; } } else @@ -661,8 +751,7 @@ void st_joystick_setup(void) /* Init Joystick: */ -#ifdef JOY_YES - use_joystick = YES; + use_joystick = true; if (SDL_Init(SDL_INIT_JOYSTICK) < 0) { @@ -670,29 +759,28 @@ void st_joystick_setup(void) "The Simple DirectMedia error that occured was:\n" "%s\n\n", SDL_GetError()); - use_joystick = NO; + use_joystick = false; } else { /* Open joystick: */ - if (SDL_NumJoysticks() <= 0) { fprintf(stderr, "Warning: No joysticks are available.\n"); - use_joystick = NO; + use_joystick = false; } else { - js = SDL_JoystickOpen(0); + js = SDL_JoystickOpen(joystick_num); if (js == NULL) { - fprintf(stderr, "Warning: Could not open joystick 1.\n" + fprintf(stderr, "Warning: Could not open joystick %d.\n" "The Simple DirectMedia error that occured was:\n" - "%s\n\n", SDL_GetError()); + "%s\n\n", joystick_num, SDL_GetError()); - use_joystick = NO; + use_joystick = false; } else { @@ -703,7 +791,7 @@ void st_joystick_setup(void) fprintf(stderr, "Warning: Joystick does not have enough axes!\n"); - use_joystick = NO; + use_joystick = false; } else { @@ -713,14 +801,12 @@ void st_joystick_setup(void) "Warning: " "Joystick does not have enough buttons!\n"); - use_joystick = NO; + use_joystick = false; } } } } } -#endif - } void st_audio_setup(void) @@ -728,14 +814,14 @@ void st_audio_setup(void) /* Init SDL Audio silently even if --disable-sound : */ - if (audio_device == YES) + if (audio_device) { if (SDL_Init(SDL_INIT_AUDIO) < 0) { /* only print out message if sound or music was not disabled at command-line */ - if (use_sound == YES || use_music == YES) + if (use_sound || use_music) { fprintf(stderr, "\nWarning: I could not initialize audio!\n" @@ -746,23 +832,23 @@ void st_audio_setup(void) because in this case, use_sound & use_music' values are ignored when there's no available audio device */ - use_sound = NO; - use_music = NO; - audio_device = NO; + use_sound = false; + use_music = false; + audio_device = false; } } /* Open sound silently regarless the value of "use_sound": */ - if (audio_device == YES) + if (audio_device) { if (open_audio(44100, AUDIO_S16, 2, 2048) < 0) { /* only print out message if sound or music was not disabled at command-line */ - if ((use_sound == YES) || (use_music == YES)) + if (use_sound || use_music) { fprintf(stderr, "\nWarning: I could not set up audio for 44100 Hz " @@ -770,9 +856,9 @@ void st_audio_setup(void) "The Simple DirectMedia error that occured was:\n" "%s\n\n", SDL_GetError()); } - use_sound = NO; - use_music = NO; - audio_device = NO; + use_sound = false; + use_music = false; + audio_device = false; } } @@ -785,16 +871,16 @@ void st_shutdown(void) { close_audio(); SDL_Quit(); + saveconfig(); } - /* --- ABORT! --- */ -void st_abort(const char * reason,const char * details) +void st_abort(const std::string& reason, const std::string& details) { - fprintf(stderr, "\nError: %s\n%s\n\n", reason, details); + fprintf(stderr, "\nError: %s\n%s\n\n", reason.c_str(), details.c_str()); st_shutdown(); - exit(1); + abort(); } @@ -809,13 +895,13 @@ void seticon(void) /* Load icon into a surface: */ - icon = IMG_Load(DATA_PREFIX "/images/icon.png"); + icon = IMG_Load((datadir + "/images/icon.png").c_str()); if (icon == NULL) { fprintf(stderr, - "\nError: I could not load the icon image: %s\n" + "\nError: I could not load the icon image: %s%s\n" "The Simple DirectMedia error that occured was:\n" - "%s\n\n", DATA_PREFIX "/images/icon.png", SDL_GetError()); + "%s\n\n", datadir.c_str(), "/images/icon.png", SDL_GetError()); exit(1); } @@ -845,25 +931,7 @@ void parseargs(int argc, char * argv[]) { int i; - /* Set defaults: */ - - - debug_mode = NO; - use_fullscreen = NO; - show_fps = NO; - use_gl = NO; - -#ifndef NOSOUND - - use_sound = YES; - use_music = YES; - audio_device = YES; -#else - - use_sound = NO; - use_music = NO; - audio_device = NO; -#endif + loadconfig(); /* Parse arguments: */ @@ -874,7 +942,12 @@ void parseargs(int argc, char * argv[]) { /* Use full screen: */ - use_fullscreen = YES; + use_fullscreen = true; + } + else if (strcmp(argv[i], "--joystick") == 0 || strcmp(argv[i], "-j") == 0) + { + assert(i+1 < argc); + joystick_num = atoi(argv[++i]); } else if (strcmp(argv[i], "--worldmap") == 0) { @@ -884,13 +957,13 @@ void parseargs(int argc, char * argv[]) || strcmp(argv[i], "-d") == 0 ) { assert(i+1 < argc); - datadir = argv[i+1]; + datadir = argv[++i]; } else if (strcmp(argv[i], "--show-fps") == 0) { /* Use full screen: */ - show_fps = YES; + show_fps = true; } else if (strcmp(argv[i], "--opengl") == 0 || strcmp(argv[i], "-gl") == 0) @@ -898,10 +971,13 @@ void parseargs(int argc, char * argv[]) #ifndef NOOPENGL /* Use OpengGL: */ - use_gl = YES; + use_gl = true; #endif - } + else if (strcmp(argv[i], "--sdl") == 0) + { + use_gl = false; + } else if (strcmp(argv[i], "--usage") == 0) { /* Show usage: */ @@ -911,63 +987,52 @@ void parseargs(int argc, char * argv[]) else if (strcmp(argv[i], "--version") == 0) { /* Show version: */ - - printf("Super Tux - version " VERSION "\n"); + printf("SuperTux " VERSION "\n"); exit(0); } else if (strcmp(argv[i], "--disable-sound") == 0) { /* Disable the compiled in sound feature */ -#ifndef NOSOUND printf("Sounds disabled \n"); - use_sound = NO; -#else - - printf("Warning: Sound capability has not been compiled into this build.\n"); -#endif - + use_sound = false; } else if (strcmp(argv[i], "--disable-music") == 0) { /* Disable the compiled in sound feature */ -#ifndef NOSOUND printf("Music disabled \n"); - use_music = NO; -#else - - printf("Warning: Music feature is not compiled in \n"); -#endif - + use_music = false; } else if (strcmp(argv[i], "--debug-mode") == 0) { /* Enable the debug-mode */ - debug_mode = YES; + debug_mode = true; } else if (strcmp(argv[i], "--help") == 0) - { /* Show help: */ + { /* Show help: */ puts("Super Tux " VERSION "\n" " Please see the file \"README.txt\" for more details.\n"); printf("Usage: %s [OPTIONS] FILENAME\n\n", argv[0]); puts("Display Options:\n" - " --fullscreen Run in fullscreen mode.\n" - " --opengl If opengl support was compiled in, this will enable\n" - " the EXPERIMENTAL OpenGL mode.\n" + " --fullscreen Run in fullscreen mode.\n" + " --opengl If opengl support was compiled in, this will enable\n" + " the EXPERIMENTAL OpenGL mode.\n" + " --sdl Use non-opengl renderer\n" "\n" "Sound Options:\n" - " --disable-sound If sound support was compiled in, this will\n" - " disable sound for this session of the game.\n" - " --disable-music Like above, but this will disable music.\n" + " --disable-sound If sound support was compiled in, this will\n" + " disable sound for this session of the game.\n" + " --disable-music Like above, but this will disable music.\n" "\n" "Misc Options:\n" - " --worldmap Start in worldmap-mode (EXPERIMENTAL)\n" - " -d, --datadir DIR Load Game data from DIR (default: automatic)\n" - " --debug-mode Enables the debug-mode, which is useful for developers.\n" - " --help Display a help message summarizing command-line\n" - " options, license and game controls.\n" - " --usage Display a brief message summarizing command-line options.\n" - " --version Display the version of SuperTux you're running.\n\n" + " -j, --joystick NUM Use joystick NUM (default: 0)\n" + " --worldmap Start in worldmap-mode (EXPERIMENTAL)\n" + " -d, --datadir DIR Load Game data from DIR (default: automatic)\n" + " --debug-mode Enables the debug-mode, which is useful for developers.\n" + " --help Display a help message summarizing command-line\n" + " options, license and game controls.\n" + " --usage Display a brief message summarizing command-line options.\n" + " --version Display the version of SuperTux you're running.\n\n" ); exit(0); }