From 41a31420cf091aeb4e986503387855d41e550106 Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 25 Apr 2011 14:39:00 +0200 Subject: - add intro sound on every round - add dieing sound - add dieing animation - add die on moving onto colorized block --- pacman-c++/block.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'pacman-c++/block.cpp') diff --git a/pacman-c++/block.cpp b/pacman-c++/block.cpp index 68dd735..7f9dd14 100644 --- a/pacman-c++/block.cpp +++ b/pacman-c++/block.cpp @@ -36,18 +36,21 @@ void Block::setNeighbours(unsigned int neighbours) setSprite(neighbours * Constants::sprite_offset, 0, Constants::field_size.width, Constants::field_size.height); } -bool Block::checkEnter(Actor *actor) +bool Block::checkEnter(Actor * /* actor */) { if (m_color == Color::none) return false; - return (m_color == actor->color()); + return true; } -bool Block::enter(Actor *actor) +GameEntity::EnteredState Block::enter(Actor *actor) { - if (m_color != actor->color()) - { - //TODO: actor dies + game ends - } - return true; + if (m_color != Color::none && m_color != actor->color()) + return DestroyedActor; + return Nothing; +} + +void Block::onDie(Actor *actor) +{ + actor->die(); } -- cgit v1.2.3