{
std::string exedir = std::string(dirname(exe_file)) + "/";
- datadir = exedir + "../data/"; // SuperTux run from source dir
+ datadir = exedir + "../data"; // SuperTux run from source dir
if (access(datadir.c_str(), F_OK) != 0)
{
- datadir = exedir + "../share/supertux/"; // SuperTux run from PATH
+ datadir = exedir + "../share/supertux"; // SuperTux run from PATH
if (access(datadir.c_str(), F_OK) != 0)
{ // If all fails, fall back to compiled path
datadir = DATA_PREFIX;
main_menu->additem(MN_GOTO, "Start Game",0,load_game_menu, MNID_STARTGAME);
main_menu->additem(MN_GOTO, "Contrib Levels",0,contrib_menu, MNID_CONTRIB);
main_menu->additem(MN_GOTO, "Options",0,options_menu, MNID_OPTIONMENU);
- main_menu->additem(MN_ACTION,"Level editor",0,0, MNID_LEVELEDITOR);
+ main_menu->additem(MN_ACTION,"Level Editor",0,0, MNID_LEVELEDITOR);
main_menu->additem(MN_ACTION,"Credits",0,0, MNID_CREDITS);
main_menu->additem(MN_ACTION,"Quit",0,0, MNID_QUITMAINMENU);
#ifndef NOOPENGL
options_menu->additem(MN_TOGGLE,"OpenGL",use_gl,0, MNID_OPENGL);
#else
- options_menu->additem(MN_DEACTIVE,"OpenGL (not supported)",use_gl,MNID_OPENGL);
+ options_menu->additem(MN_DEACTIVE,"OpenGL (not supported)",use_gl, 0, MNID_OPENGL);
#endif
options_menu->additem(MN_TOGGLE,"Fullscreen",use_fullscreen,0, MNID_FULLSCREEN);
if(audio_device)
options_menu->additem(MN_DEACTIVE,"Music ", false,0, MNID_MUSIC);
}
options_menu->additem(MN_TOGGLE,"Show FPS ",show_fps,0, MNID_SHOWFPS);
- options_menu->additem(MN_GOTO,"Key Setup",0,options_keys_menu);
- if(use_joystick)
- options_menu->additem(MN_GOTO,"Joystick Setup",0,options_joystick_menu);
+ options_menu->additem(MN_GOTO,"Keyboard Setup",0,options_keys_menu);
+
+ //if(use_joystick)
+ // options_menu->additem(MN_GOTO,"Joystick Setup",0,options_joystick_menu);
+
options_menu->additem(MN_HL,"",0,0);
options_menu->additem(MN_BACK,"Back",0,0);
options_keys_menu->additem(MN_CONTROLFIELD,"Right move", 0,0, 0,&keymap.right);
options_keys_menu->additem(MN_CONTROLFIELD,"Jump", 0,0, 0,&keymap.jump);
options_keys_menu->additem(MN_CONTROLFIELD,"Duck", 0,0, 0,&keymap.duck);
- options_keys_menu->additem(MN_CONTROLFIELD,"Power", 0,0, 0,&keymap.fire);
+ options_keys_menu->additem(MN_CONTROLFIELD,"Power/Run", 0,0, 0,&keymap.fire);
options_keys_menu->additem(MN_HL,"",0,0);
options_keys_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_DEACTIVE,"Slot 1",0,0, 1);
+ load_game_menu->additem(MN_DEACTIVE,"Slot 2",0,0, 2);
+ load_game_menu->additem(MN_DEACTIVE,"Slot 3",0,0, 3);
+ load_game_menu->additem(MN_DEACTIVE,"Slot 4",0,0, 4);
+ load_game_menu->additem(MN_DEACTIVE,"Slot 5",0,0, 5);
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_DEACTIVE,"Slot 1",0,0, 1);
+ save_game_menu->additem(MN_DEACTIVE,"Slot 2",0,0, 2);
+ save_game_menu->additem(MN_DEACTIVE,"Slot 3",0,0, 3);
+ save_game_menu->additem(MN_DEACTIVE,"Slot 4",0,0, 4);
+ save_game_menu->additem(MN_DEACTIVE,"Slot 5",0,0, 5);
save_game_menu->additem(MN_HL,"",0,0);
save_game_menu->additem(MN_BACK,"Back",0,0);
{
int slot = load_game_menu->check();
- if(slot != -1 && load_game_menu->get_item(slot).kind == MN_ACTION)
+ if(slot != -1 && load_game_menu->get_item_by_id(slot).kind == MN_ACTION)
{
char slotfile[1024];
- snprintf(slotfile, 1024, "%s/slot%d.stsg", st_save_dir, slot-1);
+ snprintf(slotfile, 1024, "%s/slot%d.stsg", st_save_dir, slot);
if (access(slotfile, F_OK) != 0)
{
draw_intro();
}
+ fadeout();
WorldMapNS::WorldMap worldmap;
// Load the game or at least set the savegame_file variable
{
/* Free global images: */
-
delete black_text;
delete gold_text;
delete white_text;
delete red_text;
delete white_small_text;
delete white_big_text;
+ delete yellow_nums;
/* Free GUI/menu images: */
delete checkbox;
abort();
}
-
/* Set Icon (private) */
void seticon(void)