projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some more sound_manager->preloads into object constructors
[supertux.git]
/
src
/
object
/
growup.cpp
diff --git
a/src/object/growup.cpp
b/src/object/growup.cpp
index
948955d
..
32e3674
100644
(file)
--- a/
src/object/growup.cpp
+++ b/
src/object/growup.cpp
@@
-1,7
+1,7
@@
// $Id$
// $Id$
-//
+//
// SuperTux
// SuperTux
-// Copyright (C) 200
5
Matthias Braun <matze@braunis.de>
+// Copyright (C) 200
6
Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-12,40
+12,31
@@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// 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.
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <config.h>
#include <math.h>
#include <config.h>
#include <math.h>
-#include "growup.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "player.h"
-#include "app/globals.h"
-#include "sprite/sprite_manager.h"
+#include "growup.hpp"
+#include "resources.hpp"
+#include "camera.hpp"
+#include "sector.hpp"
+#include "player.hpp"
+#include "audio/sound_manager.hpp"
-GrowUp::GrowUp(const Vector& pos)
+GrowUp::GrowUp()
+ : MovingSprite(Vector(0,0), "images/powerups/egg/egg.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
{
{
- bbox.set_pos(pos);
- bbox.set_size(32, 32);
-
- sprite = sprite_manager->create("egg");
physic.enable_gravity(true);
physic.set_velocity_x(100);
physic.enable_gravity(true);
physic.set_velocity_x(100);
-}
-
-GrowUp::~GrowUp()
-{
- delete sprite;
+ sound_manager->preload("sounds/grow.wav");
}
void
}
void
-GrowUp::
action
(float elapsed_time)
+GrowUp::
update
(float elapsed_time)
{
movement = physic.get_movement(elapsed_time);
}
{
movement = physic.get_movement(elapsed_time);
}
@@
-65,8
+56,8
@@
GrowUp::collision(GameObject& other, const CollisionHit& hit)
Player* player = dynamic_cast<Player*>(&other);
if(player != 0) {
Player* player = dynamic_cast<Player*>(&other);
if(player != 0) {
- player->
set
_bonus(GROWUP_BONUS, true);
- sound_manager->play
_sound("grow
");
+ player->
add
_bonus(GROWUP_BONUS, true);
+ sound_manager->play
("sounds/grow.wav
");
remove_me();
return ABORT_MOVE;
remove_me();
return ABORT_MOVE;
@@
-75,9
+66,3
@@
GrowUp::collision(GameObject& other, const CollisionHit& hit)
return FORCE_MOVE;
}
return FORCE_MOVE;
}
-void
-GrowUp::draw(DrawingContext& context)
-{
- sprite->draw(context, get_pos(), LAYER_OBJECTS);
-}
-