projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qmax patch to fix bug #0000389 - colors in infoblocks
[supertux.git]
/
src
/
badguy
/
dart.cpp
diff --git
a/src/badguy/dart.cpp
b/src/badguy/dart.cpp
index
7e2d5df
..
bfed64a
100644
(file)
--- a/
src/badguy/dart.cpp
+++ b/
src/badguy/dart.cpp
@@
-1,7
+1,7
@@
// $Id$
//
// Dart - Your average poison dart
// $Id$
//
// Dart - Your average poison dart
-// Copyright (C) 2006 Christoph Sommer <
supertux
@2006.expires.deltadevelopment.de>
+// Copyright (C) 2006 Christoph Sommer <
christoph.sommer
@2006.expires.deltadevelopment.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
@@
-28,31
+28,39
@@
namespace {
static const std::string SOUNDFILE = "sounds/flame.wav";
static const std::string SOUNDFILE = "sounds/flame.wav";
-Dart::Dart(const lisp::Lisp& reader)
-
: BadGuy(reader, "images/creatures/dart/dart.sprite"), set_direction(false
), parent(0)
+Dart::Dart(const lisp::Lisp& reader)
+
: BadGuy(reader, "images/creatures/dart/dart.sprite"
), parent(0)
{
physic.enable_gravity(false);
countMe = false;
{
physic.enable_gravity(false);
countMe = false;
+ sound_manager->preload(SOUNDFILE);
+ sound_manager->preload("sounds/darthit.wav");
+ sound_manager->preload("sounds/stomp.wav");
}
Dart::Dart(const Vector& pos, Direction d, const BadGuy* parent = 0)
}
Dart::Dart(const Vector& pos, Direction d, const BadGuy* parent = 0)
-
: BadGuy(pos, "images/creatures/dart/dart.sprite"), set_direction(true), initial_direction(d
), parent(parent)
+
: BadGuy(pos, d, "images/creatures/dart/dart.sprite"
), parent(parent)
{
physic.enable_gravity(false);
countMe = false;
{
physic.enable_gravity(false);
countMe = false;
+ sound_manager->preload(SOUNDFILE);
+ sound_manager->preload("sounds/darthit.wav");
+ sound_manager->preload("sounds/stomp.wav");
}
Dart::Dart(const Dart& other)
}
Dart::Dart(const Dart& other)
-
: BadGuy(other), set_direction(other.set_direction), initial_direction(other.initial_direction
), parent(other.parent)
+
: BadGuy(other
), parent(other.parent)
{
{
- sound_source.reset(sound_manager->create_sound_source(SOUNDFILE));
+ sound_manager->preload(SOUNDFILE);
+ sound_manager->preload("sounds/darthit.wav");
+ sound_manager->preload("sounds/stomp.wav");
}
Dart::~Dart()
{
}
}
Dart::~Dart()
{
}
-bool
+bool
Dart::updatePointers(const GameObject* from_object, GameObject* to_object)
{
if (from_object == parent) {
Dart::updatePointers(const GameObject* from_object, GameObject* to_object)
{
if (from_object == parent) {
@@
-72,12
+80,15
@@
Dart::write(lisp::Writer& writer)
}
void
}
void
-Dart::activate()
-{
- if (set_direction) dir = initial_direction;
+Dart::initialize()
+{
physic.set_velocity_x(dir == LEFT ? -::SPEED : ::SPEED);
sprite->set_action(dir == LEFT ? "flying-left" : "flying-right");
physic.set_velocity_x(dir == LEFT ? -::SPEED : ::SPEED);
sprite->set_action(dir == LEFT ? "flying-left" : "flying-right");
+}
+void
+Dart::activate()
+{
sound_source.reset(sound_manager->create_sound_source(SOUNDFILE));
sound_source->set_position(get_pos());
sound_source->set_looping(true);
sound_source.reset(sound_manager->create_sound_source(SOUNDFILE));
sound_source->set_position(get_pos());
sound_source->set_looping(true);
@@
-88,28
+99,26
@@
Dart::activate()
void
Dart::deactivate()
void
Dart::deactivate()
-{
+{
sound_source.reset();
remove_me();
}
sound_source.reset();
remove_me();
}
-void
+void
Dart::active_update(float elapsed_time)
{
BadGuy::active_update(elapsed_time);
sound_source->set_position(get_pos());
}
Dart::active_update(float elapsed_time)
{
BadGuy::active_update(elapsed_time);
sound_source->set_position(get_pos());
}
-
-HitResponse
-Dart::collision_solid(GameObject& , const CollisionHit& )
+void
+Dart::collision_solid(const CollisionHit& )
{
sound_manager->play("sounds/darthit.wav", get_pos());
remove_me();
{
sound_manager->play("sounds/darthit.wav", get_pos());
remove_me();
- return ABORT_MOVE;
}
}
-HitResponse
+HitResponse
Dart::collision_badguy(BadGuy& badguy, const CollisionHit& )
{
// ignore collisions with parent
Dart::collision_badguy(BadGuy& badguy, const CollisionHit& )
{
// ignore collisions with parent
@@
-122,7
+131,7
@@
Dart::collision_badguy(BadGuy& badguy, const CollisionHit& )
return ABORT_MOVE;
}
return ABORT_MOVE;
}
-HitResponse
+HitResponse
Dart::collision_player(Player& player, const CollisionHit& hit)
{
sound_manager->play("sounds/stomp.wav", get_pos());
Dart::collision_player(Player& player, const CollisionHit& hit)
{
sound_manager->play("sounds/stomp.wav", get_pos());
@@
-131,4
+140,3
@@
Dart::collision_player(Player& player, const CollisionHit& hit)
}
IMPLEMENT_FACTORY(Dart, "dart")
}
IMPLEMENT_FACTORY(Dart, "dart")
-