#include "defines.h"
#include "globals.h"
#include "setup.h"
-#include "screen.h"
-#include "texture.h"
+#include "screen/screen.h"
+#include "screen/texture.h"
#include "menu.h"
#include "gameloop.h"
#include "configfile.h"
#include "worldmap.h"
#include "resources.h"
#include "intro.h"
-#include "music_manager.h"
+#include "sound_manager.h"
+#include "gettext.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 800
+#define SCREEN_H 600
+
/* Local function prototypes: */
void seticon(void);
worldmap_menu = new Menu();
main_menu->set_pos(screen->w/2, 335);
- 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);
+ 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, MNID_OPENGL);
+ 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);
+ options_menu->additem(MN_TOGGLE,_("Fullscreen"),use_fullscreen,0, MNID_FULLSCREEN);
if(audio_device)
{
- options_menu->additem(MN_TOGGLE,"Sound ", use_sound,0, MNID_SOUND);
- options_menu->additem(MN_TOGGLE,"Music ", use_music,0, MNID_MUSIC);
+ 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 ", false,0, MNID_SOUND);
- options_menu->additem(MN_DEACTIVE,"Music ", false,0, MNID_MUSIC);
+ 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, MNID_SHOWFPS);
- options_menu->additem(MN_GOTO,"Key Setup",0,options_keys_menu);
+ options_menu->additem(MN_TOGGLE,_("Show FPS "),show_fps,0, MNID_SHOWFPS);
+ options_menu->additem(MN_GOTO,_("Setup Keys"),0,options_keys_menu);
+
if(use_joystick)
- options_menu->additem(MN_GOTO,"Joystick Setup",0,options_joystick_menu);
+ options_menu->additem(MN_GOTO,_("Setup Joystick"),0,options_joystick_menu);
+
options_menu->additem(MN_HL,"",0,0);
- options_menu->additem(MN_BACK,"Back",0,0);
+ options_menu->additem(MN_BACK,_("Back"),0,0);
- options_keys_menu->additem(MN_LABEL,"Key Setup",0,0);
+ options_keys_menu->additem(MN_LABEL,_("Keyboard Setup"),0,0);
options_keys_menu->additem(MN_HL,"",0,0);
- options_keys_menu->additem(MN_CONTROLFIELD,"Left move", 0,0, 0,&keymap.left);
- 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_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,_("Activate"), 0, 0, 0,
+ &keymap.activate);
+ 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);
+ 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_LABEL,_("Joystick Setup"),0,0);
options_joystick_menu->additem(MN_HL,"",0,0);
- options_joystick_menu->additem(MN_CONTROLFIELD,"X axis", 0,0, 0,&joystick_keymap.x_axis);
- options_joystick_menu->additem(MN_CONTROLFIELD,"Y axis", 0,0, 0,&joystick_keymap.y_axis);
- options_joystick_menu->additem(MN_CONTROLFIELD,"A button", 0,0, 0,&joystick_keymap.a_button);
- options_joystick_menu->additem(MN_CONTROLFIELD,"B button", 0,0, 0,&joystick_keymap.b_button);
- options_joystick_menu->additem(MN_CONTROLFIELD,"Start", 0,0, 0,&joystick_keymap.start_button);
- options_joystick_menu->additem(MN_CONTROLFIELD,"DeadZone", 0,0, 0,&joystick_keymap.dead_zone);
+ //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);
+ options_joystick_menu->additem(MN_BACK,_("Back"),0,0);
}
- load_game_menu->additem(MN_LABEL,"Start Game",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, 1);
load_game_menu->additem(MN_DEACTIVE,"Slot 2",0,0, 2);
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);
+ load_game_menu->additem(MN_BACK,_("Back"),0,0);
- save_game_menu->additem(MN_LABEL,"Save Game",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, 1);
save_game_menu->additem(MN_DEACTIVE,"Slot 2",0,0, 2);
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_LABEL,_("Pause"),0,0);
game_menu->additem(MN_HL,"",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_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,MNID_ABORTLEVEL);
+ game_menu->additem(MN_ACTION,_("Abort Level"),0,0,MNID_ABORTLEVEL);
- worldmap_menu->additem(MN_LABEL,"Pause",0,0);
+ worldmap_menu->additem(MN_LABEL,_("Pause"),0,0);
worldmap_menu->additem(MN_HL,"",0,0);
- worldmap_menu->additem(MN_ACTION,"Continue",0,0,MNID_RETURNWORLDMAP);
- worldmap_menu->additem(MN_ACTION,"Save",0,0,MNID_SAVEGAME);
- worldmap_menu->additem(MN_GOTO,"Options",0,options_menu);
+ 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,MNID_QUITWORLDMAP);
+ worldmap_menu->additem(MN_ACTION,_("Quit Game"),0,0,MNID_QUITWORLDMAP);
- highscore_menu->additem(MN_TEXTFIELD,"Enter your name:",0,0);
+ highscore_menu->additem(MN_TEXTFIELD,_("Enter your name:"),0,0);
}
void update_load_save_game_menu(Menu* pmenu)
draw_intro();
}
- fadeout();
+ // shrink_fade(Point((screen->w/2),(screen->h/2)), 1000);
+ fadeout(256);
WorldMapNS::WorldMap worldmap;
// Load the game or at least set the savegame_file variable
if(use_music != options_menu->isToggled(MNID_MUSIC))
{
use_music = !use_music;
- music_manager->enable_music(use_music);
+ sound_manager->enable_music(use_music);
}
break;
case MNID_SHOWFPS:
SDL_EnableUNICODE(1);
/* Load global images: */
-
- 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);
+ gold_text = new Font(datadir + "/images/fonts/gold.png", Font::TEXT, 16,18);
+ blue_text = new Font(datadir + "/images/fonts/blue.png", Font::TEXT, 16,18,3);
+ white_text = new Font(datadir + "/images/fonts/white.png",
+ Font::TEXT, 16,18);
+ white_small_text = new Font(datadir + "/images/fonts/white-small.png",
+ Font::TEXT, 8,9, 1);
+ white_big_text = new Font(datadir + "/images/fonts/white-big.png",
+ Font::TEXT, 20,22, 3);
+ yellow_nums = new Font(datadir + "/images/fonts/numbers.png",
+ Font::NUM, 32,32);
/* Load GUI/menu images: */
checkbox = new Surface(datadir + "/images/status/checkbox.png", USE_ALPHA);
/* 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 white_text;
delete blue_text;
- delete red_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)
{
/* Load icon into a surface: */
- icon = IMG_Load((datadir + "/images/icon.xpm").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.xpm", SDL_GetError());
+ "%s\n\n", datadir.c_str(), "/images/supertux.xpm", SDL_GetError());
exit(1);
}
<< " 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 )
}
else if (strcmp(argv[i], "--help") == 0)
{ /* 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"
+ puts(_(" SuperTux " 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"
- " --sdl Use non-opengl renderer\n"
+ " --opengl If OpenGL support was compiled in, this will tell\n"
+ " SuperTux to make use of it.\n"
+ " --sdl Use the SDL software graphical renderer\n"
"\n"
"Sound Options:\n"
" --disable-sound If sound support was compiled in, this will\n"
" -j, --joystick NUM Use joystick NUM (default: 0)\n"
" --joymap XAXIS:YAXIS:A:B:START\n"
" Define how joystick buttons and axis should be mapped\n"
- " --worldmap Start in worldmap-mode (EXPERIMENTAL)\n"
+ " --leveleditor Opens the leveleditor in a file. (Only works when a file is provided.)\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);
}
else if (argv[i][0] != '-')
/* Display the usage message: */
- fprintf(fi, "Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--debug-mode] | [--usage | --help | --version] [--worldmap] FILENAME\n",
+ fprintf(fi, _("Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--debug-mode] | [--usage | --help | --version] [--leveleditor] FILENAME\n"),
prog);
projects / supertux.git / blobdiff