projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove draw_text from renderer.hpp and lightmap.hpp since text drawing is done in...
[supertux.git]
/
src
/
badguy
/
flyingsnowball.cpp
diff --git
a/src/badguy/flyingsnowball.cpp
b/src/badguy/flyingsnowball.cpp
index
4c3acdb
..
a0abf23
100644
(file)
--- a/
src/badguy/flyingsnowball.cpp
+++ b/
src/badguy/flyingsnowball.cpp
@@
-25,13
+25,13
@@
#include "random_generator.hpp"
#include "object/sprite_particle.hpp"
#include "random_generator.hpp"
#include "object/sprite_particle.hpp"
-static const float FLYTIME = 1.0;
-static const float FLYSPEED =
100.0
;
+static const float FLYTIME = 1.0
f
;
+static const float FLYSPEED =
-100.0f
;
namespace {
namespace {
- const float PUFF_PROBABILITY = 0.1; /**< chanche of puffs being spawned in the current cycle */
- const float PUFF_INTERVAL_MIN = 0.1; /**< spawn new puff of smoke at most that often */
- const float PUFF_INTERVAL_MAX = 1.1; /**< spawn new puff of smoke at least that often */
+ const float PUFF_PROBABILITY = 0.1
f
; /**< chanche of puffs being spawned in the current cycle */
+ const float PUFF_INTERVAL_MIN = 0.1
f
; /**< spawn new puff of smoke at most that often */
+ const float PUFF_INTERVAL_MAX = 1.1
f
; /**< spawn new puff of smoke at least that often */
}
FlyingSnowBall::FlyingSnowBall(const lisp::Lisp& reader)
}
FlyingSnowBall::FlyingSnowBall(const lisp::Lisp& reader)
@@
-57,7
+57,7
@@
FlyingSnowBall::write(lisp::Writer& writer)
writer.end_list("flyingsnowball");
}
writer.end_list("flyingsnowball");
}
-void
+void
FlyingSnowBall::activate()
{
sprite->set_action(dir == LEFT ? "left" : "right");
FlyingSnowBall::activate()
{
sprite->set_action(dir == LEFT ? "left" : "right");
@@
-68,25
+68,23
@@
FlyingSnowBall::activate()
}
bool
}
bool
-FlyingSnowBall::collision_squished(
Player& player
)
+FlyingSnowBall::collision_squished(
GameObject& object
)
{
sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
{
sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
- kill_squished(
player
);
+ kill_squished(
object
);
return true;
}
return true;
}
-HitResponse
-FlyingSnowBall::collision_solid(
GameObject& ,
const CollisionHit& hit)
+void
+FlyingSnowBall::collision_solid(const CollisionHit& hit)
{
{
- if(
fabsf(hit.normal.y) > .5) { // hit floor or roof?
+ if(
hit.top || hit.bottom) {
physic.set_velocity_y(0);
}
physic.set_velocity_y(0);
}
-
- return CONTINUE;
}
void
}
void
-FlyingSnowBall::active_update(float elapsed_time)
+FlyingSnowBall::active_update(float elapsed_time)
{
if(timer.check()) {
if(mode == FLY_UP) {
{
if(timer.check()) {
if(mode == FLY_UP) {
@@
-95,7
+93,7
@@
FlyingSnowBall::active_update(float elapsed_time)
// stop puffing
puff_timer.stop();
// stop puffing
puff_timer.stop();
-
+
} else if(mode == FLY_DOWN) {
mode = FLY_UP;
physic.set_velocity_y(FLYSPEED);
} else if(mode == FLY_DOWN) {
mode = FLY_UP;
physic.set_velocity_y(FLYSPEED);
@@
-121,7
+119,7
@@
FlyingSnowBall::active_update(float elapsed_time)
Vector ppos = bbox.get_middle();
Vector pspeed = Vector(systemRandom.randf(-10, 10), 150);
Vector paccel = Vector(0,0);
Vector ppos = bbox.get_middle();
Vector pspeed = Vector(systemRandom.randf(-10, 10), 150);
Vector paccel = Vector(0,0);
- Sector::current()->add_object(new SpriteParticle("images/objects/particles/smoke.sprite", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1));
+ Sector::current()->add_object(new SpriteParticle("images/objects/particles/smoke.sprite",
"default",
ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1));
puff_timer.start(systemRandom.randf(PUFF_INTERVAL_MIN, PUFF_INTERVAL_MAX));
}
}
puff_timer.start(systemRandom.randf(PUFF_INTERVAL_MIN, PUFF_INTERVAL_MAX));
}
}