X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.cpp;h=1420d7f422c17a0aa165dbb873487c0462a4f0ce;hb=35fa5542fadf1848919363620c7a76b04150c283;hp=0cd48d87981a88e8322df738768c325c3bccd9d4;hpb=99ffd1de8f666bffa646064a587238803acec131;p=supertux.git diff --git a/src/sector.cpp b/src/sector.cpp index 0cd48d879..1420d7f42 100644 --- a/src/sector.cpp +++ b/src/sector.cpp @@ -45,8 +45,9 @@ Sector* Sector::_current = 0; Sector::Sector() - : gravity(10), player(0), solids(0), background(0), camera(0), - currentmusic(LEVEL_MUSIC), end_sequence_animation_type(NONE_ENDSEQ_ANIM) + : end_sequence_animation_type(NONE_ENDSEQ_ANIM), + gravity(10), player(0), solids(0), background(0), camera(0), + currentmusic(LEVEL_MUSIC) { song_title = "Mortimers_chipdisko.mod"; player = new Player(); @@ -700,10 +701,12 @@ Sector::add_bouncy_brick(const Vector& pos) } BadGuy* -Sector::add_bad_guy(float x, float y, BadGuyKind kind) +Sector::add_bad_guy(float x, float y, BadGuyKind kind, bool activate) { BadGuy* badguy = new BadGuy(kind, x, y); add_object(badguy); + if(activate) + badguy->activate(LEFT); return badguy; } @@ -755,6 +758,12 @@ Sector::add_particles(const Vector& epicenter, const Vector& velocity, const Vec return true; } +void +Sector::add_floating_text(const Vector& pos, const std::string& text) +{ + add_object(new FloatingText(pos, text)); +} + /* Break a brick: */ bool Sector::trybreakbrick(const Vector& pos, bool small)