Prevent "Return to Level Editor" from working, if no levelsubset is loaded. This...

[supertux.git] / src / setup.cpp

diff --git a/src/setup.cpp b/src/setup.cpp
index 36835e1..ef77667 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);
@@ -579,8 +583,10 @@ void st_general_setup(void)
 
   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);
@@ -604,9 +610,11 @@ void st_general_free(void)
   /* 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;