From 64a02ded2453082fe13e8a8b408933e8fada131c Mon Sep 17 00:00:00 2001 From: totycro Date: Sat, 9 Apr 2011 15:38:52 +0200 Subject: hackishly disabled audio for srv made test movement work --- pacman-c++/sceneholder.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'pacman-c++/sceneholder.cpp') diff --git a/pacman-c++/sceneholder.cpp b/pacman-c++/sceneholder.cpp index ba9cc97..dbc3ca5 100644 --- a/pacman-c++/sceneholder.cpp +++ b/pacman-c++/sceneholder.cpp @@ -34,7 +34,16 @@ void SceneHolder::updateMap(const Transmission::map_t& map) //qDebug() << "col=" << color; PixmapItem* item = NULL; - if (cur & Transmission::block) + if (cur == 0) { // no update + } else if (cur & Transmission::empty) { + PixmapItem* oldItem = visualMap[x][y]; + // remove elements (in case it's not an actor) + if (oldItem != NULL && dynamic_cast(item) == 0) { + m_scene->removeItem(oldItem); + visualMap[x][y] = NULL; + delete oldItem; + } + } else if (cur & Transmission::block) { unsigned int neighbours = Block::None; // check left side @@ -71,8 +80,10 @@ void SceneHolder::updateMap(const Transmission::map_t& map) Util::transmissionMovementToActor(cur & Transmission::direction_mask); //actor->move(direction, mapPositionToCoord(x, y)); } - else + else { + qDebug() << "abort at " << cur; Q_ASSERT(false); + } if (item != NULL) { -- cgit v1.2.3