projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix particle system speeds
[supertux.git]
/
src
/
resources.cpp
diff --git
a/src/resources.cpp
b/src/resources.cpp
index
d6e7364
..
ac23078
100644
(file)
--- a/
src/resources.cpp
+++ b/
src/resources.cpp
@@
-26,10
+26,8
@@
#include "gui/button.h"
#include "scene.h"
#include "player.h"
#include "gui/button.h"
#include "scene.h"
#include "player.h"
-#include "badguy.h"
#include "gameobjs.h"
#include "resources.h"
#include "gameobjs.h"
#include "resources.h"
-#include "badguy_specs.h"
Surface* img_waves[3];
Surface* img_water;
Surface* img_waves[3];
Surface* img_water;
@@
-157,9
+155,6
@@
void loadshared()
ice_tux->arms = sprite_manager->create("big-tux-arms");
ice_tux->feet = sprite_manager->create("big-tux-feet");
ice_tux->arms = sprite_manager->create("big-tux-arms");
ice_tux->feet = sprite_manager->create("big-tux-feet");
- /* Load Bad Guys resources */
- badguyspecs_manager = new BadGuySpecsManager(datadir + "/badguys.strf");
-
/* Water: */
img_water = new Surface(datadir + "/images/shared/water.png", false);
/* Water: */
img_water = new Surface(datadir + "/images/shared/water.png", false);
@@
-254,7
+249,7
@@
void loadshared()
/* Herring song */
herring_song = SoundManager::get
/* Herring song */
herring_song = SoundManager::get
- ()->load_music(datadir + "/music/
SALCON.MOD
");
+ ()->load_music(datadir + "/music/
salcon.mod
");
level_end_song = SoundManager::get
()->load_music(datadir + "/music/leveldone.mod");
}
level_end_song = SoundManager::get
()->load_music(datadir + "/music/leveldone.mod");
}