Now the growings animation looks pretty cool :)

[supertux.git] / src / globals.cpp

diff --git a/src/globals.cpp b/src/globals.cpp
index 5809b4b..0c16a30 100644 (file)
--- a/src/globals.cpp
+++ b/src/globals.cpp
@@ -27,7 +27,7 @@ JoystickKeymap::JoystickKeymap()
 {
   a_button     = 0;
   b_button     = 1;
-  start_button = 9;
+  start_button = 2;
   
   x_axis = 0;
   y_axis = 1;
@@ -38,14 +38,16 @@ JoystickKeymap::JoystickKeymap()
 JoystickKeymap joystick_keymap;
 
 SDL_Surface * screen;
-Text* black_text;
-Text* gold_text;
-Text* blue_text;
-Text* red_text;
-Text* yellow_nums;
-Text* white_text;
-Text* white_small_text;
-Text* white_big_text;
+Font* black_text;
+Font* gold_text;
+Font* silver_text;
+Font* blue_text;
+Font* red_text;
+Font* green_text;
+Font* yellow_nums;
+Font* white_text;
+Font* white_small_text;
+Font* white_big_text;
 
 MouseCursor * mouse_cursor;
 
@@ -54,11 +56,11 @@ bool use_joystick;
 bool use_fullscreen;
 bool debug_mode;
 bool show_fps;
-float game_speed = 1.2f;
+float game_speed = 1.0f;
 
 int joystick_num = 0;
 char* level_startup_file = 0;
-bool launch_worldmap_mode = false;
+bool launch_leveleditor_mode = false;
 
 /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
 char *st_dir, *st_save_dir;