#include "configfile.h"
#include "scene.h"
#include "worldmap.h"
+#include "resources.h"
+#include "intro.h"
+#include "music_manager.h"
#include "player.h"
#define DATA_PREFIX "./data/"
#endif
+/* Screen proprities: */
+/* Don't use this to test for the actual screen sizes. Use screen->w/h instead! */
+#define SCREEN_W 640
+#define SCREEN_H 480
+
/* Local function prototypes: */
void seticon(void);
{
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 = new Menu();
options_menu = new Menu();
- options_controls_menu = new Menu();
+ options_keys_menu = new Menu();
+ options_joystick_menu = new Menu();
load_game_menu = new Menu();
save_game_menu = new Menu();
game_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);
+ 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,"Credits",0,0, MNID_CREDITS);
+ main_menu->additem(MN_ACTION,"Quit",0,0, MNID_QUITMAINMENU);
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);
+ options_menu->additem(MN_TOGGLE,"OpenGL",use_gl,0, MNID_OPENGL);
#else
- options_menu->additem(MN_DEACTIVE,"OpenGL (not supported)",use_gl,0);
+ options_menu->additem(MN_DEACTIVE,"OpenGL (not supported)",use_gl, 0, MNID_OPENGL);
#endif
- options_menu->additem(MN_TOGGLE,"Fullscreen",use_fullscreen,0);
+ options_menu->additem(MN_TOGGLE,"Fullscreen",use_fullscreen,0, MNID_FULLSCREEN);
if(audio_device)
{
- options_menu->additem(MN_TOGGLE,"Sound ",use_sound,0);
- options_menu->additem(MN_TOGGLE,"Music ",use_music,0);
+ options_menu->additem(MN_TOGGLE,"Sound ", use_sound,0, MNID_SOUND);
+ options_menu->additem(MN_TOGGLE,"Music ", use_music,0, MNID_MUSIC);
}
else
{
- options_menu->additem(MN_DEACTIVE,"Sound ",use_sound,0);
- options_menu->additem(MN_DEACTIVE,"Music ",use_music,0);
+ options_menu->additem(MN_DEACTIVE,"Sound ", false,0, MNID_SOUND);
+ options_menu->additem(MN_DEACTIVE,"Music ", false,0, MNID_MUSIC);
}
- options_menu->additem(MN_TOGGLE,"Show FPS ",show_fps,0);
- options_menu->additem(MN_GOTO,"Controls ",0,options_controls_menu);
+ options_menu->additem(MN_TOGGLE,"Show FPS ",show_fps,0, MNID_SHOWFPS);
+ 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_controls_menu->additem(MN_LABEL,"Controls",0,0);
- options_controls_menu->additem(MN_HL,"",0,0);
- options_controls_menu->additem(MN_CONTROLFIELD,"Right move", 0,0, &keymap.right);
- options_controls_menu->additem(MN_CONTROLFIELD,"Left move", 0,0, &keymap.left);
- options_controls_menu->additem(MN_CONTROLFIELD,"Jump", 0,0, &keymap.jump);
- options_controls_menu->additem(MN_CONTROLFIELD,"Duck", 0,0, &keymap.duck);
- options_controls_menu->additem(MN_CONTROLFIELD,"Power", 0,0, &keymap.fire);
- options_controls_menu->additem(MN_HL,"",0,0);
- options_controls_menu->additem(MN_BACK,"Back",0,0);
-
+ options_keys_menu->additem(MN_LABEL,"Key Setup",0,0);
+ options_keys_menu->additem(MN_HL,"",0,0);
+ options_keys_menu->additem(MN_CONTROLFIELD_KB,"Left move", 0,0, 0,&keymap.left);
+ options_keys_menu->additem(MN_CONTROLFIELD_KB,"Right move", 0,0, 0,&keymap.right);
+ options_keys_menu->additem(MN_CONTROLFIELD_KB,"Jump", 0,0, 0,&keymap.jump);
+ options_keys_menu->additem(MN_CONTROLFIELD_KB,"Duck", 0,0, 0,&keymap.duck);
+ options_keys_menu->additem(MN_CONTROLFIELD_KB,"Power/Run", 0,0, 0,&keymap.fire);
+ options_keys_menu->additem(MN_HL,"",0,0);
+ options_keys_menu->additem(MN_BACK,"Back",0,0);
+
+ if(use_joystick)
+ {
+ options_joystick_menu->additem(MN_LABEL,"Joystick Setup",0,0);
+ options_joystick_menu->additem(MN_HL,"",0,0);
+ //options_joystick_menu->additem(MN_CONTROLFIELD_JS,"X axis", 0,0, 0,&joystick_keymap.x_axis);
+ //options_joystick_menu->additem(MN_CONTROLFIELD_JS,"Y axis", 0,0, 0,&joystick_keymap.y_axis);
+ options_joystick_menu->additem(MN_CONTROLFIELD_JS,"A button", 0,0, 0,&joystick_keymap.a_button);
+ options_joystick_menu->additem(MN_CONTROLFIELD_JS,"B button", 0,0, 0,&joystick_keymap.b_button);
+ //options_joystick_menu->additem(MN_CONTROLFIELD_JS,"Start", 0,0, 0,&joystick_keymap.start_button);
+ //options_joystick_menu->additem(MN_CONTROLFIELD_JS,"DeadZone", 0,0, 0,&joystick_keymap.dead_zone);
+ options_joystick_menu->additem(MN_HL,"",0,0);
+ options_joystick_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);
game_menu->additem(MN_LABEL,"Pause",0,0);
game_menu->additem(MN_HL,"",0,0);
- game_menu->additem(MN_ACTION,"Continue",0,0);
+ game_menu->additem(MN_ACTION,"Continue",0,0,MNID_CONTINUE);
game_menu->additem(MN_GOTO,"Options",0,options_menu);
game_menu->additem(MN_HL,"",0,0);
- game_menu->additem(MN_ACTION,"Abort Level",0,0);
+ game_menu->additem(MN_ACTION,"Abort Level",0,0,MNID_ABORTLEVEL);
worldmap_menu->additem(MN_LABEL,"Pause",0,0);
worldmap_menu->additem(MN_HL,"",0,0);
- worldmap_menu->additem(MN_ACTION,"Continue",0,0);
- worldmap_menu->additem(MN_ACTION,"Save",0,0);
+ worldmap_menu->additem(MN_ACTION,"Continue",0,0,MNID_RETURNWORLDMAP);
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);
+ worldmap_menu->additem(MN_ACTION,"Quit Game",0,0,MNID_QUITWORLDMAP);
highscore_menu->additem(MN_TEXTFIELD,"Enter your name:",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)
{
- WorldMapNS::WorldMap worldmap;
-
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
worldmap.loadgame(slotfile);
{
switch (options_menu->check())
{
- case 2:
+ case MNID_OPENGL:
#ifndef NOOPENGL
- if(use_gl != options_menu->item[2].toggled)
+ if(use_gl != options_menu->isToggled(MNID_OPENGL))
{
use_gl = !use_gl;
st_video_setup();
}
+#else
+ options_menu->get_item_by_id(MNID_OPENGL).toggled = false;
#endif
break;
- case 3:
- if(use_fullscreen != options_menu->item[3].toggled)
+ case MNID_FULLSCREEN:
+ if(use_fullscreen != options_menu->isToggled(MNID_FULLSCREEN))
{
use_fullscreen = !use_fullscreen;
st_video_setup();
}
break;
- case 4:
- if(use_sound != options_menu->item[4].toggled)
+ case MNID_SOUND:
+ if(use_sound != options_menu->isToggled(MNID_SOUND))
use_sound = !use_sound;
break;
- case 5:
- if(use_music != options_menu->item[5].toggled)
+ case MNID_MUSIC:
+ if(use_music != options_menu->isToggled(MNID_MUSIC))
{
- enable_music(options_menu->item[5].toggled);
+ use_music = !use_music;
+ music_manager->enable_music(use_music);
}
break;
- case 6:
- if(show_fps != options_menu->item[6].toggled)
+ case MNID_SHOWFPS:
+ if(show_fps != options_menu->isToggled(MNID_SHOWFPS))
show_fps = !show_fps;
break;
}
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);
+ silver_text = new Text(datadir + "/images/status/letters-silver.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);
+ green_text = new Text(datadir + "/images/status/letters-green.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);
+ white_big_text = new Text(datadir + "/images/status/letters-white-big.png", TEXT_TEXT, 20,22);
yellow_nums = new Text(datadir + "/images/status/numbers.png", TEXT_NUM, 32,32);
/* Load GUI/menu images: */
/* Load the mouse-cursor */
mouse_cursor = new MouseCursor( datadir + "/images/status/mousecursor.png",1);
+ MouseCursor::set_current(mouse_cursor);
}
{
/* Free global images: */
-
delete black_text;
delete gold_text;
+ delete silver_text;
delete white_text;
delete blue_text;
delete red_text;
+ delete green_text;
delete white_small_text;
delete white_big_text;
+ delete yellow_nums;
/* Free GUI/menu images: */
delete checkbox;
void st_video_setup(void)
{
- if(screen != NULL)
- SDL_FreeSurface(screen);
-
/* Init SDL Video: */
-
if (SDL_Init(SDL_INIT_VIDEO) < 0)
{
fprintf(stderr,
void st_video_setup_sdl(void)
{
- SDL_FreeSurface(screen);
-
if (use_fullscreen)
{
- screen = SDL_SetVideoMode(640, 480, 0, SDL_FULLSCREEN ) ; /* | SDL_HWSURFACE); */
+ screen = SDL_SetVideoMode(SCREEN_W, SCREEN_H, 0, SDL_FULLSCREEN ) ; /* | SDL_HWSURFACE); */
if (screen == NULL)
{
fprintf(stderr,
}
else
{
- screen = SDL_SetVideoMode(640, 480, 0, SDL_HWSURFACE | SDL_DOUBLEBUF );
+ screen = SDL_SetVideoMode(SCREEN_W, SCREEN_H, 0, SDL_HWSURFACE | SDL_DOUBLEBUF );
if (screen == NULL)
{
if (use_fullscreen)
{
- screen = SDL_SetVideoMode(640, 480, 0, SDL_FULLSCREEN | SDL_OPENGL) ; /* | SDL_HWSURFACE); */
+ screen = SDL_SetVideoMode(SCREEN_W, SCREEN_H, 0, SDL_FULLSCREEN | SDL_OPENGL) ; /* | SDL_HWSURFACE); */
if (screen == NULL)
{
fprintf(stderr,
}
else
{
- screen = SDL_SetVideoMode(640, 480, 0, SDL_OPENGL);
+ screen = SDL_SetVideoMode(SCREEN_W, SCREEN_H, 0, SDL_OPENGL);
if (screen == NULL)
{
abort();
}
-
/* Set Icon (private) */
void seticon(void)
{
- int masklen;
- Uint8 * mask;
+// int masklen;
+// Uint8 * mask;
SDL_Surface * icon;
/* Load icon into a surface: */
- icon = IMG_Load((datadir + "/images/icon.png").c_str());
+ icon = IMG_Load((datadir + "/images/supertux.xpm").c_str());
if (icon == NULL)
{
fprintf(stderr,
"\nError: I could not load the icon image: %s%s\n"
"The Simple DirectMedia error that occured was:\n"
- "%s\n\n", datadir.c_str(), "/images/icon.png", SDL_GetError());
+ "%s\n\n", datadir.c_str(), "/images/supertux.xpm", SDL_GetError());
exit(1);
}
/* Create mask: */
-
+/*
masklen = (((icon -> w) + 7) / 8) * (icon -> h);
mask = (Uint8*) malloc(masklen * sizeof(Uint8));
memset(mask, 0xFF, masklen);
-
+*/
/* Set icon: */
- SDL_WM_SetIcon(icon, mask);
+ SDL_WM_SetIcon(icon, NULL);//mask);
/* Free icon surface & mask: */
- free(mask);
+// free(mask);
SDL_FreeSurface(icon);
}
<< " Start-Button: " << joystick_keymap.start_button << std::endl;
}
}
- else if (strcmp(argv[i], "--worldmap") == 0)
+ else if (strcmp(argv[i], "--leveleditor") == 0)
{
- launch_worldmap_mode = true;
+ launch_leveleditor_mode = true;
}
else if (strcmp(argv[i], "--datadir") == 0
|| strcmp(argv[i], "-d") == 0 )
"Misc Options:\n"
" -j, --joystick NUM Use joystick NUM (default: 0)\n"
" --joymap XAXIS:YAXIS:A:B:START\n"
+ " --leveleditor Opens the leveleditor in a file. (Only works when a file is provided.)\n"
" Define how joystick buttons and axis should be mapped\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"
projects / supertux.git / blobdiff