#include <stdexcept>
BonusBlock::BonusBlock(const Vector& pos, int data) :
- Block(sprite_manager->create("images/objects/bonus_block/bonusblock.sprite")),
+ Block(SpriteManager::current()->create("images/objects/bonus_block/bonusblock.sprite")),
contents(),
- object(0),
+ object(),
hit_counter(1),
sprite_name(),
script(),
case 4: contents = CONTENT_1UP; break;
case 5: contents = CONTENT_ICEGROW; break;
case 6: contents = CONTENT_LIGHT;
- sound_manager->preload("sounds/switch.ogg");
+ SoundManager::current()->preload("sounds/switch.ogg");
lightsprite=Surface::create("/images/objects/lightmap_light/bonusblock_light.png");
break;
case 7: contents = CONTENT_TRAMPOLINE;
//object = new Trampoline(get_pos(), false); //needed if this is to be moved to custom
break;
case 8: contents = CONTENT_CUSTOM;
- object = new Trampoline(get_pos(), true);
+ object = std::make_shared<Trampoline>(get_pos(), true);
break;
case 9: contents = CONTENT_CUSTOM;
- object = new Rock(get_pos(), "images/objects/rock/rock.sprite");
+ object = std::make_shared<Rock>(get_pos(), "images/objects/rock/rock.sprite");
break;
case 10: contents = CONTENT_RAIN; break;
case 11: contents = CONTENT_EXPLODE; break;
case 12: contents = CONTENT_CUSTOM;
- object = new PowerUp(get_pos(), "images/powerups/potions/red-potion.sprite");
+ object = std::make_shared<PowerUp>(get_pos(), "images/powerups/potions/red-potion.sprite");
break;
+ case 13: contents = CONTENT_AIRGROW; break;
+ case 14: contents = CONTENT_EARTHGROW; break;
default:
log_warning << "Invalid box contents" << std::endl;
contents = CONTENT_COIN;
}
BonusBlock::BonusBlock(const Reader& lisp) :
- Block(sprite_manager->create("images/objects/bonus_block/bonusblock.sprite")),
+ Block(SpriteManager::current()->create("images/objects/bonus_block/bonusblock.sprite")),
contents(),
object(0),
hit_counter(1),
iter.value()->get(pos.y);
} else if(token == "sprite") {
iter.value()->get(sprite_name);
- sprite = sprite_manager->create(sprite_name);
+ sprite = SpriteManager::current()->create(sprite_name);
} else if(token == "count") {
iter.value()->get(hit_counter);
} else if(token == "script") {
contents = CONTENT_FIREGROW;
} else if(contentstring == "icegrow") {
contents = CONTENT_ICEGROW;
+ } else if(contentstring == "airgrow") {
+ contents = CONTENT_AIRGROW;
+ } else if(contentstring == "earthgrow") {
+ contents = CONTENT_EARTHGROW;
} else if(contentstring == "star") {
contents = CONTENT_STAR;
} else if(contentstring == "1up") {
contents = CONTENT_SCRIPT;
} else if(contentstring == "light") {
contents = CONTENT_LIGHT;
- sound_manager->preload("sounds/switch.ogg");
+ SoundManager::current()->preload("sounds/switch.ogg");
} else if(contentstring == "trampoline") {
contents = CONTENT_TRAMPOLINE;
} else if(contentstring == "rain") {
}
} else {
if(contents == CONTENT_CUSTOM) {
- GameObject* game_object = ObjectFactory::instance().create(token, *(iter.lisp()));
- object = dynamic_cast<MovingObject*> (game_object);
+ GameObjectPtr game_object = ObjectFactory::instance().create(token, *(iter.lisp()));
+ object = std::dynamic_pointer_cast<MovingObject>(game_object);
if(object == 0)
throw std::runtime_error(
"Only MovingObjects are allowed inside BonusBlocks");
BonusBlock::~BonusBlock()
{
- delete object;
}
void
}
HitResponse
-BonusBlock::collision(GameObject& other, const CollisionHit& hit){
+BonusBlock::collision(GameObject& other, const CollisionHit& hit_){
Player* player = dynamic_cast<Player*> (&other);
if (player) {
try_open(player);
}
}
- return Block::collision(other, hit);
+ return Block::collision(other, hit_);
}
void
BonusBlock::try_open(Player *player)
{
if(sprite->get_action() == "empty") {
- sound_manager->play("sounds/brick.wav");
+ SoundManager::current()->play("sounds/brick.wav");
return;
}
switch(contents) {
case CONTENT_COIN:
{
- Sector::current()->add_object(new BouncyCoin(get_pos(), true));
+ Sector::current()->add_object(std::make_shared<BouncyCoin>(get_pos(), true));
player->get_status()->add_coins(1);
if (hit_counter != 0)
Sector::current()->get_level()->stats.coins++;
case CONTENT_FIREGROW:
{
if(player->get_status()->bonus == NO_BONUS) {
- SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp(direction));
+ auto riser = std::make_shared<SpecialRiser>(get_pos(), std::make_shared<GrowUp>(direction));
sector->add_object(riser);
} else {
- SpecialRiser* riser = new SpecialRiser(
- get_pos(), new Flower(FIRE_BONUS));
+ auto riser = std::make_shared<SpecialRiser>(
+ get_pos(), std::make_shared<Flower>(FIRE_BONUS));
sector->add_object(riser);
}
- sound_manager->play("sounds/upgrade.wav");
+ SoundManager::current()->play("sounds/upgrade.wav");
break;
}
case CONTENT_ICEGROW:
{
if(player->get_status()->bonus == NO_BONUS) {
- SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp(direction));
+ auto riser = std::make_shared<SpecialRiser>(get_pos(), std::make_shared<GrowUp>(direction));
sector->add_object(riser);
} else {
- SpecialRiser* riser = new SpecialRiser(
- get_pos(), new Flower(ICE_BONUS));
+ auto riser = std::make_shared<SpecialRiser>(
+ get_pos(), std::make_shared<Flower>(ICE_BONUS));
sector->add_object(riser);
}
- sound_manager->play("sounds/upgrade.wav");
+ SoundManager::current()->play("sounds/upgrade.wav");
+ break;
+ }
+
+ case CONTENT_AIRGROW:
+ {
+ if(player->get_status()->bonus == NO_BONUS) {
+ auto riser = std::make_shared<SpecialRiser>(get_pos(), std::make_shared<GrowUp>(direction));
+ sector->add_object(riser);
+ } else {
+ auto riser = std::make_shared<SpecialRiser>(
+ get_pos(), std::make_shared<Flower>(AIR_BONUS));
+ sector->add_object(riser);
+ }
+ SoundManager::current()->play("sounds/upgrade.wav");
+ break;
+ }
+
+ case CONTENT_EARTHGROW:
+ {
+ if(player->get_status()->bonus == NO_BONUS) {
+ auto riser = std::make_shared<SpecialRiser>(get_pos(), std::make_shared<GrowUp>(direction));
+ sector->add_object(riser);
+ } else {
+ auto riser = std::make_shared<SpecialRiser>(
+ get_pos(), std::make_shared<Flower>(EARTH_BONUS));
+ sector->add_object(riser);
+ }
+ SoundManager::current()->play("sounds/upgrade.wav");
break;
}
case CONTENT_STAR:
{
- sector->add_object(new Star(get_pos() + Vector(0, -32), direction));
- sound_manager->play("sounds/upgrade.wav");
+ sector->add_object(std::make_shared<Star>(get_pos() + Vector(0, -32), direction));
+ SoundManager::current()->play("sounds/upgrade.wav");
break;
}
case CONTENT_1UP:
{
- sector->add_object(new OneUp(get_pos(), direction));
- sound_manager->play("sounds/upgrade.wav");
+ sector->add_object(std::make_shared<OneUp>(get_pos(), direction));
+ SoundManager::current()->play("sounds/upgrade.wav");
break;
}
case CONTENT_CUSTOM:
{
- SpecialRiser* riser = new SpecialRiser(get_pos(), object);
+ auto riser = std::make_shared<SpecialRiser>(get_pos(), object);
object = 0;
sector->add_object(riser);
- sound_manager->play("sounds/upgrade.wav");
+ SoundManager::current()->play("sounds/upgrade.wav");
break;
}
sprite->set_action("off");
else
sprite->set_action("on");
- sound_manager->play("sounds/switch.ogg");
+ SoundManager::current()->play("sounds/switch.ogg");
break;
}
case CONTENT_TRAMPOLINE:
{
- SpecialRiser* riser = new SpecialRiser(get_pos(), new Trampoline(get_pos(), false));
+ auto riser = std::make_shared<SpecialRiser>(get_pos(), std::make_shared<Trampoline>(get_pos(), false));
sector->add_object(riser);
- sound_manager->play("sounds/upgrade.wav");
+ SoundManager::current()->play("sounds/upgrade.wav");
break;
}
case CONTENT_RAIN:
{
hit_counter = 1; // multiple hits of coin rain is not allowed
- Sector::current()->add_object(new CoinRain(get_pos(), true));
- sound_manager->play("sounds/upgrade.wav");
+ Sector::current()->add_object(std::make_shared<CoinRain>(get_pos(), true));
+ SoundManager::current()->play("sounds/upgrade.wav");
break;
}
case CONTENT_EXPLODE:
{
hit_counter = 1; // multiple hits of coin explode is not allowed
- Sector::current()->add_object(new CoinExplode(get_pos() + Vector (0, -40)));
- sound_manager->play("sounds/upgrade.wav");
+ Sector::current()->add_object(std::make_shared<CoinExplode>(get_pos() + Vector (0, -40)));
+ SoundManager::current()->play("sounds/upgrade.wav");
break;
}
}
BonusBlock::try_drop(Player *player)
{
if(sprite->get_action() == "empty") {
- sound_manager->play("sounds/brick.wav");
+ SoundManager::current()->play("sounds/brick.wav");
return;
}
assert(sector);
// First what's below the bonus block, if solid send it up anyway (excepting doll)
- Rectf dest;
- dest.p1.x = bbox.get_left() + 1;
- dest.p1.y = bbox.get_bottom() + 1;
- dest.p2.x = bbox.get_right() - 1;
- dest.p2.y = dest.p1.y + 30;
- if (!Sector::current()->is_free_of_statics(dest, this, true) && !(contents == CONTENT_1UP)) {
+ Rectf dest_;
+ dest_.p1.x = bbox.get_left() + 1;
+ dest_.p1.y = bbox.get_bottom() + 1;
+ dest_.p2.x = bbox.get_right() - 1;
+ dest_.p2.y = dest_.p1.y + 30;
+ if (!Sector::current()->is_free_of_statics(dest_, this, true) && !(contents == CONTENT_1UP)) {
try_open(player);
return;
}
case CONTENT_FIREGROW:
{
- sector->add_object(new PowerUp(get_pos() + Vector(0, 32), "images/powerups/fireflower/fireflower.sprite"));
- sound_manager->play("sounds/upgrade.wav");
+ sector->add_object(std::make_shared<PowerUp>(get_pos() + Vector(0, 32), "images/powerups/fireflower/fireflower.sprite"));
+ SoundManager::current()->play("sounds/upgrade.wav");
countdown = true;
break;
}
case CONTENT_ICEGROW:
{
- sector->add_object(new PowerUp(get_pos() + Vector(0, 32), "images/powerups/iceflower/iceflower.sprite"));
- sound_manager->play("sounds/upgrade.wav");
+ sector->add_object(std::make_shared<PowerUp>(get_pos() + Vector(0, 32), "images/powerups/iceflower/iceflower.sprite"));
+ SoundManager::current()->play("sounds/upgrade.wav");
+ countdown = true;
+ break;
+ }
+
+ case CONTENT_AIRGROW:
+ {
+ sector->add_object(std::make_shared<PowerUp>(get_pos() + Vector(0, 32), "images/powerups/airflower/airflower.sprite"));
+ SoundManager::current()->play("sounds/upgrade.wav");
+ countdown = true;
+ break;
+ }
+
+ case CONTENT_EARTHGROW:
+ {
+ sector->add_object(std::make_shared<PowerUp>(get_pos() + Vector(0, 32), "images/powerups/earthflower/earthflower.sprite"));
+ SoundManager::current()->play("sounds/upgrade.wav");
countdown = true;
break;
}
case CONTENT_STAR:
{
- sector->add_object(new Star(get_pos() + Vector(0, 32), direction));
- sound_manager->play("sounds/upgrade.wav");
+ sector->add_object(std::make_shared<Star>(get_pos() + Vector(0, 32), direction));
+ SoundManager::current()->play("sounds/upgrade.wav");
countdown = true;
break;
}
case CONTENT_1UP:
{
- sector->add_object(new OneUp(get_pos(), DOWN));
- sound_manager->play("sounds/upgrade.wav");
+ sector->add_object(std::make_shared<OneUp>(get_pos(), DOWN));
+ SoundManager::current()->play("sounds/upgrade.wav");
countdown = true;
break;
}
object->set_pos(get_pos() + Vector(0, 32));
sector->add_object(object);
object = 0;
- sound_manager->play("sounds/upgrade.wav");
+ SoundManager::current()->play("sounds/upgrade.wav");
countdown = true;
break;
}
case CONTENT_EXPLODE:
{
hit_counter = 1; // multiple hits of coin explode is not allowed
- Sector::current()->add_object(new CoinExplode(get_pos() + Vector (0, 40)));
- sound_manager->play("sounds/upgrade.wav");
+ Sector::current()->add_object(std::make_shared<CoinExplode>(get_pos() + Vector (0, 40)));
+ SoundManager::current()->play("sounds/upgrade.wav");
countdown = true;
break;
}
projects / supertux.git / blobdiff