#include <config.h>
#include "block.hpp"
+#include "msg.hpp"
#include <stdexcept>
//---------------------------------------------------------------------------
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" << 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;
} else if(contentstring == "custom") {
contents = CONTENT_CUSTOM;
} else {
- std::cerr << "Invalid box contents '" << contentstring << "'.\n";
+ msg_warning << "Invalid box contents '" << contentstring << "'" << std::endl;
}
} 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" << std::endl;
}
}
}
//---------------------------------------------------------------------------
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);