Added support for drawing effects again.

[supertux.git] / src / setup.cpp

diff --git a/src/setup.cpp b/src/setup.cpp
index af5a964..98cc84c 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -42,8 +42,8 @@
 #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"
@@ -64,8 +64,8 @@
 
 /* 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
+#define SCREEN_W 800
+#define SCREEN_H 600
 
 /* Local function prototypes: */
 
@@ -505,6 +505,7 @@ bool process_load_game_menu()
           draw_intro();
         }
 
+      // shrink_fade(Point((screen->w/2),(screen->h/2)), 1000);
       fadeout();
       WorldMapNS::WorldMap worldmap;
      
@@ -581,16 +582,19 @@ void st_general_setup(void)
 
   /* 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);
-  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,22);
-  yellow_nums = new Text(datadir + "/images/status/numbers.png", TEXT_NUM, 32,32);
+  black_text  = new Font(datadir + "/images/status/letters-black.png", TEXT_TEXT, 16,18);
+  gold_text   = new Font(datadir + "/images/status/letters-gold.png", TEXT_TEXT, 16,18);
+  silver_text = new Font(datadir + "/images/status/letters-silver.png", TEXT_TEXT, 16,18);
+  blue_text   = new Font(datadir + "/images/status/letters-blue.png", TEXT_TEXT,
+      16,18, 3);
+  red_text    = new Font(datadir + "/images/status/letters-red.png", TEXT_TEXT, 16,18);
+  green_text  = new Font(datadir + "/images/status/letters-green.png", TEXT_TEXT, 16,18);
+  white_text  = new Font(datadir + "/images/status/letters-white.png", TEXT_TEXT, 16,18);
+  white_small_text = new Font(datadir +
+      "/images/status/letters-white-small.png", TEXT_TEXT, 8,9, 1);
+  white_big_text   = new Font(datadir + "/images/status/letters-white-big.png",
+      TEXT_TEXT, 20,22, 3);
+  yellow_nums = new Font(datadir + "/images/status/numbers.png", TEXT_NUM, 32,32);
 
   /* Load GUI/menu images: */
   checkbox = new Surface(datadir + "/images/status/checkbox.png", USE_ALPHA);
@@ -1051,8 +1055,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"
+               "  --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"
@@ -1093,7 +1097,7 @@ void usage(char * prog, int ret)
 
   /* 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);