Added support for Benjamin's green fonts.

[supertux.git] / src / setup.cpp

diff --git a/src/setup.cpp b/src/setup.cpp
index 040f9be..5465cf0 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -62,6 +62,11 @@
 #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);
@@ -467,7 +472,6 @@ void st_menu(void)
   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);
@@ -581,6 +585,7 @@ void st_general_setup(void)
   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);
+  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);
@@ -607,6 +612,7 @@ void st_general_free(void)
   delete white_text;
   delete blue_text;
   delete red_text;
+  delete green_text;
   delete white_small_text;
   delete white_big_text;
   delete yellow_nums;
@@ -969,9 +975,9 @@ void parseargs(int argc, char * argv[])
                         << "  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 )
@@ -1048,8 +1054,8 @@ void parseargs(int argc, char * argv[])
                "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"