added a random value to zeekling's speed

[supertux.git] / src / resources.cpp

diff --git a/src/resources.cpp b/src/resources.cpp
index 95bf48d..a533ab7 100644 (file)
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -16,19 +16,20 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 #include <config.h>
 
-#include "app/globals.h"
 #include "sprite/sprite_manager.h"
-#include "app/setup.h"
 #include "gui/menu.h"
 #include "gui/button.h"
 #include "resources.h"
+#include "file_system.h"
 #include "tile_manager.h"
 #include "object/gameobjs.h"
 #include "object/player.h"
 
+std::string datadir;
+std::string user_dir;
+
 MusicRef herring_song;
 MusicRef level_end_song;
 MusicRef credits_song;
@@ -37,6 +38,8 @@ SpriteManager* sprite_manager = 0;
 TileManager* tile_manager = 0;
 SoundManager* sound_manager = 0;
 
+MouseCursor* mouse_cursor = 0;
+
 Font* gold_text;
 Font* blue_text;
 Font* gray_text;
@@ -49,28 +52,28 @@ Font* white_big_text;
 void load_shared()
 {
   /* Load GUI/menu images: */
-  checkbox = new Surface(datadir + "/images/status/checkbox.png", true);
-  checkbox_checked = new Surface(datadir + "/images/status/checkbox-checked.png", true);
-  back = new Surface(datadir + "/images/status/back.png", true);
-  arrow_left = new Surface(datadir + "/images/icons/left.png", true);
-  arrow_right = new Surface(datadir + "/images/icons/right.png", true);
+  checkbox = new Surface(datadir + "/images/engine/menu/checkbox-unchecked.png", true);
+  checkbox_checked = new Surface(datadir + "/images/engine/menu/checkbox-checked.png", true);
+  back = new Surface(datadir + "/images/engine/menu/arrow-back.png", true);
+  arrow_left = new Surface(datadir + "/images/engine/menu/arrow-left.png", true);
+  arrow_right = new Surface(datadir + "/images/engine/menu/arrow-right.png", true);
 
   /* Load the mouse-cursor */
-  mouse_cursor = new MouseCursor( datadir + "/images/status/mousecursor.png",1);
+  mouse_cursor = new MouseCursor(datadir + "/images/engine/menu/mousecursor.png");
   MouseCursor::set_current(mouse_cursor);
 
   /* Load global images: */
-  gold_text = new Font(datadir + "/images/fonts/gold.png", Font::TEXT, 16,18);
-  blue_text = new Font(datadir + "/images/fonts/blue.png", Font::TEXT, 16,18,3);
-  white_text  = new Font(datadir + "/images/fonts/white.png",
+  gold_text = new Font(datadir + "/images/engine/fonts/gold.png", Font::TEXT, 16,18);
+  blue_text = new Font(datadir + "/images/engine/fonts/blue.png", Font::TEXT, 16,18,3);
+  white_text  = new Font(datadir + "/images/engine/fonts/white.png",
                          Font::TEXT, 16,18);
-  gray_text  = new Font(datadir + "/images/fonts/gray.png",
+  gray_text  = new Font(datadir + "/images/engine/fonts/gray.png",
                         Font::TEXT, 16,18);
-  white_small_text = new Font(datadir + "/images/fonts/white-small.png",
+  white_small_text = new Font(datadir + "/images/engine/fonts/white-small.png",
                               Font::TEXT, 8,9, 1);
-  white_big_text   = new Font(datadir + "/images/fonts/white-big.png",
+  white_big_text   = new Font(datadir + "/images/engine/fonts/white-big.png",
                               Font::TEXT, 20,22, 3);
-  yellow_nums = new Font(datadir + "/images/fonts/numbers.png",
+  yellow_nums = new Font(datadir + "/images/engine/fonts/numbers.png",
                          Font::NUM, 32,32);
 
   Menu::default_font = white_text;
@@ -82,17 +85,17 @@ void load_shared()
   Button::info_font = white_small_text;
 
   sprite_manager = new SpriteManager(
-      get_resource_filename("/images/supertux.strf"));
-  tile_manager = new TileManager("/images/tilesets/supertux.stgt");
+      get_resource_filename("/images/sprites.strf"));
+  tile_manager = new TileManager("/images/tiles.strf");
 
   /* Tuxes: */
   char img_name[1024];
   for (int i = 0; i < GROWING_FRAMES; i++)
     {
-      sprintf(img_name, "%s/images/shared/tux-grow-left-%i.png", datadir.c_str(), i+1);
+      sprintf(img_name, "%s/images/creatures/tux_grow/left-%i.png", datadir.c_str(), i+1);
       growingtux_left[i] = new Surface(img_name, true);
 
-      sprintf(img_name, "%s/images/shared/tux-grow-right-%i.png", datadir.c_str(), i+1);
+      sprintf(img_name, "%s/images/creatures/tux_grow/right-%i.png", datadir.c_str(), i+1);
       growingtux_right[i] = new Surface(img_name, true);
     }
 
@@ -124,7 +127,7 @@ void load_shared()
   load_object_gfx();
 
   /* Tux life: */
-  tux_life = new Surface(datadir + "/images/shared/tux-life.png",
+  tux_life = new Surface(datadir + "/images/creatures/tux_small/tux-life.png",
                          true);
 
   /* Sound effects: */