// 02111-1307, USA.
#include <config.h>
-#include "block.h"
+#include "block.hpp"
+#include "msg.hpp"
#include <stdexcept>
-#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 "lisp/list_iterator.h"
-#include "object_factory.h"
+#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")), object(0)
+ : 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";
+ msg_warning("Invalid box contents");
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;
} else if(contentstring == "custom") {
contents = CONTENT_CUSTOM;
} else {
- std::cerr << "Invalid box contents '" << contentstring << "'.\n";
+ msg_warning("Invalid box contents '" << contentstring << "'");
}
} else {
if(contents == CONTENT_CUSTOM) {
throw std::runtime_error(
"Only MovingObjects are allowed inside BonusBlocks");
} else {
- std::cerr << "Invalid element '" << token << "' in bonusblock.\n";
+ msg_warning("Invalid element '" << token << "' in bonusblock");
}
}
}
BonusBlock::try_open()
{
if(sprite->get_action_name() == "empty") {
- sound_manager->play_sound("brick");
+ sound_manager->play("sounds/brick.wav");
return;
}
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:
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:
SpecialRiser* riser = new SpecialRiser(get_pos(), object);
object = 0;
sector->add_object(riser);
- sound_manager->play_sound("upgrade");
+ sound_manager->play("sounds/upgrade.wav");
break;
- default:
- assert(false);
+ //default:
+ //assert(false);
}
start_bounce();
//---------------------------------------------------------------------------
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) {