projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
incorporated another patch from Ondra Hosek which fixes tux not getting killed on...
[supertux.git]
/
src
/
resources.cpp
diff --git
a/src/resources.cpp
b/src/resources.cpp
index
da92958
..
e57ee37
100644
(file)
--- a/
src/resources.cpp
+++ b/
src/resources.cpp
@@
-25,9
+25,10
@@
#include "gui/menu.h"
#include "gui/button.h"
#include "scene.h"
#include "gui/menu.h"
#include "gui/button.h"
#include "scene.h"
-#include "player.h"
-#include "gameobjs.h"
#include "resources.h"
#include "resources.h"
+#include "tile_manager.h"
+#include "object/gameobjs.h"
+#include "object/player.h"
Surface* img_waves[3];
Surface* img_water;
Surface* img_waves[3];
Surface* img_water;
@@
-52,6
+53,7
@@
MusicRef herring_song;
MusicRef level_end_song;
SpriteManager* sprite_manager = 0;
MusicRef level_end_song;
SpriteManager* sprite_manager = 0;
+TileManager* tile_manager = 0;
char * soundfilenames[NUM_SOUNDS] = {
"/sounds/jump.wav",
char * soundfilenames[NUM_SOUNDS] = {
"/sounds/jump.wav",
@@
-114,7
+116,9
@@
void loadshared()
int i;
int i;
- sprite_manager = new SpriteManager(datadir + "/images/supertux.strf");
+ sprite_manager = new SpriteManager(
+ get_resource_filename("/images/supertux.strf"));
+ tile_manager = new TileManager("/images/tilesets/supertux.stgt");
/* Tuxes: */
smalltux_star = sprite_manager->create("smalltux-star");
/* Tuxes: */
smalltux_star = sprite_manager->create("smalltux-star");
@@
-302,6
+306,8
@@
void unloadshared(void)
delete sprite_manager;
sprite_manager = 0;
delete sprite_manager;
sprite_manager = 0;
+ delete tile_manager;
+ tile_manager = 0;
}
std::string get_resource_filename(const std::string& resource)
}
std::string get_resource_filename(const std::string& resource)