// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
-
#include <config.h>
-#include "block.h"
-#include "resources.h"
-#include "player.h"
-#include "sector.h"
-#include "sprite/sprite.h"
-#include "sprite/sprite_manager.h"
-#include "video/drawing_context.h"
-#include "lisp/lisp.h"
-#include "gameobjs.h"
-#include "specialriser.h"
-#include "growup.h"
-#include "flower.h"
-#include "oneup.h"
-#include "star.h"
-#include "player_status.h"
-#include "badguy/badguy.h"
-#include "coin.h"
-#include "object_factory.h"
+#include "block.hpp"
+#include "log.hpp"
+
+#include <stdexcept>
+
+#include "resources.hpp"
+#include "player.hpp"
+#include "sector.hpp"
+#include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "video/drawing_context.hpp"
+#include "lisp/lisp.hpp"
+#include "gameobjs.hpp"
+#include "specialriser.hpp"
+#include "growup.hpp"
+#include "flower.hpp"
+#include "oneup.hpp"
+#include "star.hpp"
+#include "player_status.hpp"
+#include "badguy/badguy.hpp"
+#include "coin.hpp"
+#include "object_factory.hpp"
+#include "lisp/list_iterator.hpp"
+#include "object_factory.hpp"
static const float BOUNCY_BRICK_MAX_OFFSET=8;
static const float BOUNCY_BRICK_SPEED=90;
: sprite(newsprite), bouncing(false), bounce_dir(0), bounce_offset(0)
{
bbox.set_size(32, 32.1);
+ set_group(COLGROUP_STATIC);
flags |= FLAG_SOLID;
}
//---------------------------------------------------------------------------
BonusBlock::BonusBlock(const Vector& pos, int data)
- : Block(sprite_manager->create("bonusblock"))
+ : Block(sprite_manager->create("images/objects/bonus_block/bonusblock.sprite")), object(0)
{
bbox.set_pos(pos);
sprite->set_action("normal");
case 4: contents = CONTENT_1UP; break;
case 5: contents = CONTENT_ICEGROW; break;
default:
- std::cerr << "Invalid box contents!\n";
+ log_warning << "Invalid box contents" << std::endl;
contents = CONTENT_COIN;
break;
}
}
BonusBlock::BonusBlock(const lisp::Lisp& lisp)
- : Block(sprite_manager->create("bonusblock"))
+ : Block(sprite_manager->create("images/objects/bonus_block/bonusblock.sprite"))
{
Vector pos;
- lisp.get("x", pos.x);
- lisp.get("y", pos.y);
- bbox.set_pos(pos);
- std::string contentstring;
contents = CONTENT_COIN;
- if(lisp.get("contents", contentstring)) {
- if(contentstring == "coin") {
- contents = CONTENT_COIN;
- } else if(contentstring == "firegrow") {
- contents = CONTENT_FIREGROW;
- } else if(contentstring == "icegrow") {
- contents = CONTENT_ICEGROW;
- } else if(contentstring == "star") {
- contents = CONTENT_STAR;
- } else if(contentstring == "1up") {
- contents = CONTENT_1UP;
+ lisp::ListIterator iter(&lisp);
+ while(iter.next()) {
+ const std::string& token = iter.item();
+ if(token == "x") {
+ iter.value()->get(pos.x);
+ } else if(token == "y") {
+ iter.value()->get(pos.y);
+ } else if(token == "contents") {
+ std::string contentstring;
+ iter.value()->get(contentstring);
+ if(contentstring == "coin") {
+ contents = CONTENT_COIN;
+ } else if(contentstring == "firegrow") {
+ contents = CONTENT_FIREGROW;
+ } else if(contentstring == "icegrow") {
+ contents = CONTENT_ICEGROW;
+ } else if(contentstring == "star") {
+ contents = CONTENT_STAR;
+ } else if(contentstring == "1up") {
+ contents = CONTENT_1UP;
+ } else if(contentstring == "custom") {
+ contents = CONTENT_CUSTOM;
+ } else {
+ log_warning << "Invalid box contents '" << contentstring << "'" << std::endl;
+ }
} else {
- std::cerr << "Invalid box contents '" << contentstring << "'.\n";
- }
+ if(contents == CONTENT_CUSTOM) {
+ GameObject* game_object = create_object(token, *(iter.lisp()));
+ object = dynamic_cast<MovingObject*> (game_object);
+ if(object == 0)
+ throw std::runtime_error(
+ "Only MovingObjects are allowed inside BonusBlocks");
+ } else {
+ log_warning << "Invalid element '" << token << "' in bonusblock" << std::endl;
+ }
+ }
}
+
+ if(contents == CONTENT_CUSTOM && object == 0)
+ throw std::runtime_error("Need to specify content object for custom block");
+
+ bbox.set_pos(pos);
+}
+
+BonusBlock::~BonusBlock()
+{
+ delete object;
}
void
BonusBlock::try_open()
{
if(sprite->get_action_name() == "empty") {
- sound_manager->play_sound("brick");
+ sound_manager->play("sounds/brick.wav");
return;
}
switch(contents) {
case CONTENT_COIN:
Sector::current()->add_object(new BouncyCoin(get_pos()));
- player.get_status()->incCoins();
+ player.get_status()->add_coins(1);
break;
case CONTENT_FIREGROW:
if(player.get_status()->bonus == NO_BONUS) {
- SpecialRiser* riser = new SpecialRiser(
- new GrowUp(get_pos() + Vector(0, -32)));
+ SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp());
sector->add_object(riser);
} else {
SpecialRiser* riser = new SpecialRiser(
- new Flower(get_pos() + Vector(0, -32), Flower::FIREFLOWER));
+ get_pos(), new Flower(Flower::FIREFLOWER));
sector->add_object(riser);
}
- sound_manager->play_sound("upgrade");
+ sound_manager->play("sounds/upgrade.wav");
break;
case CONTENT_ICEGROW:
if(player.get_status()->bonus == NO_BONUS) {
- SpecialRiser* riser = new SpecialRiser(
- new GrowUp(get_pos() + Vector(0, -32)));
+ SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp());
sector->add_object(riser);
} else {
- SpecialRiser* riser = new SpecialRiser(
- new Flower(get_pos() + Vector(0, -32), Flower::ICEFLOWER));
+ SpecialRiser* riser = new SpecialRiser(
+ get_pos(), new Flower(Flower::ICEFLOWER));
sector->add_object(riser);
}
- sound_manager->play_sound("upgrade");
+ sound_manager->play("sounds/upgrade.wav");
break;
case CONTENT_STAR:
sector->add_object(new OneUp(get_pos()));
break;
- default:
- assert(false);
+ case CONTENT_CUSTOM:
+ SpecialRiser* riser = new SpecialRiser(get_pos(), object);
+ object = 0;
+ sector->add_object(riser);
+ sound_manager->play("sounds/upgrade.wav");
+ break;
+
+ //default:
+ //assert(false);
}
start_bounce();
sprite->set_action("empty");
}
-IMPLEMENT_FACTORY(BonusBlock, "bonusblock")
+IMPLEMENT_FACTORY(BonusBlock, "bonusblock");
//---------------------------------------------------------------------------
Brick::Brick(const Vector& pos, int data)
- : Block(sprite_manager->create("brick")), breakable(false),
+ : Block(sprite_manager->create("images/objects/bonus_block/brick.sprite")), breakable(false),
coin_counter(0)
{
bbox.set_pos(pos);
if(sprite->get_action_name() == "empty")
return;
- sound_manager->play_sound("brick");
+ sound_manager->play("sounds/brick.wav");
Sector* sector = Sector::current();
Player& player = *(sector->player);
if(coin_counter > 0) {
sector->add_object(new BouncyCoin(get_pos()));
coin_counter--;
- player.get_status()->incCoins();
+ player.get_status()->add_coins(1);
if(coin_counter == 0)
sprite->set_action("empty");
start_bounce();
}
}
-//IMPLEMENT_FACTORY(Brick, "brick")
+//IMPLEMENT_FACTORY(Brick, "brick");
+
projects / supertux.git / blobdiff