X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fresources.cpp;h=3544a5260a6089b73f517b121ff6f4b12aba413b;hb=bc9122aa59e02b3f990bd966083c5b0849d475d4;hp=1969242816d0380bc202021242b22e831f3d036e;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git

diff --git a/src/resources.cpp b/src/resources.cpp
index 196924281..3544a5260 100644
--- 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;
@@ -56,7 +59,7 @@ void load_shared()
   arrow_right = new Surface(datadir + "/images/icons/right.png", true);
 
   /* Load the mouse-cursor */
-  mouse_cursor = new MouseCursor( datadir + "/images/status/mousecursor.png",1);
+  mouse_cursor = new MouseCursor(datadir + "/images/status/mousecursor.png");
   MouseCursor::set_current(mouse_cursor);
 
   /* Load global images: */
@@ -81,8 +84,6 @@ void load_shared()
   
   Button::info_font = white_small_text;
 
-  int i;
-
   sprite_manager = new SpriteManager(
       get_resource_filename("/images/supertux.strf"));
   tile_manager = new TileManager("/images/tilesets/supertux.stgt");
@@ -201,7 +202,7 @@ void unload_shared()
 
 std::string get_resource_filename(const std::string& resource)
 {
-  std::string filepath = user_dir + resource;
+  std::string filepath = user_dir + "/" + resource;
   if(FileSystem::faccessible(filepath))
     return filepath;