#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);
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);
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_HL,"",0,0);
worldmap_menu->additem(MN_ACTION,"Quit Game",0,0,MNID_QUITWORLDMAP);
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);
/* 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;
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)
{
<< " 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"