summaryrefslogtreecommitdiffstats
path: root/pacman-c++/sceneholder.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'pacman-c++/sceneholder.cpp')
-rw-r--r--pacman-c++/sceneholder.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/pacman-c++/sceneholder.cpp b/pacman-c++/sceneholder.cpp
index dace711..2fcfb37 100644
--- a/pacman-c++/sceneholder.cpp
+++ b/pacman-c++/sceneholder.cpp
@@ -73,8 +73,9 @@ void SceneHolder::updateMap(const Transmission::map_t& map, const unsigned int x
73 } 73 }
74 74
75 /* an item must be removed by an actor */ 75 /* an item must be removed by an actor */
76 if (actor == NULL) 76 if (actor == NULL) {
77 Q_ASSERT(false); 77 Q_ASSERT(false);
78 }
78 oldItem->onDie(actor); 79 oldItem->onDie(actor);
79 80
80 /* register item for removal in next update */ 81 /* register item for removal in next update */
@@ -132,9 +133,11 @@ void SceneHolder::updateMap(const Transmission::map_t& map, const unsigned int x
132 m_actors[color] = actor; 133 m_actors[color] = actor;
133 addItem(actor); 134 addItem(actor);
134 actor->setPos(mapPositionToCoord(x, y)); 135 actor->setPos(mapPositionToCoord(x, y));
136 qDebug() << endl << "create act " << endl;
135 } 137 }
136 else 138 else
137 { 139 {
140 qDebug() << endl << "act has pnts: " << actor->getRoundPoints() << actor->getGamePoints() << endl;
138 Actor::Movement direction = Util::transmissionMovementToActor( 141 Actor::Movement direction = Util::transmissionMovementToActor(
139 cur & Transmission::direction_mask); 142 cur & Transmission::direction_mask);
140 /* WARNING: do NOT add actor to visualMap as visualMap-items may 143 /* WARNING: do NOT add actor to visualMap as visualMap-items may
@@ -151,6 +154,7 @@ void SceneHolder::updateMap(const Transmission::map_t& map, const unsigned int x
151 qDebug() << "[SceneUpdate] actor moves: color=" << color 154 qDebug() << "[SceneUpdate] actor moves: color=" << color
152 << "direction=" << direction << "newpos=" << QPoint(x, y); 155 << "direction=" << direction << "newpos=" << QPoint(x, y);
153 } 156 }
157 actor->setPos(mapPositionToCoord(x, y));
154 } 158 }
155 159
156 if (cur & Transmission::empty) 160 if (cur & Transmission::empty)
@@ -195,6 +199,9 @@ unsigned int SceneHolder::pointsLeft()
195void SceneHolder::decrementPoints() 199void SceneHolder::decrementPoints()
196{ 200{
197 --m_pointsLeft; 201 --m_pointsLeft;
202 if (m_pointsLeft == 0) {
203 emit allPointsRemoved();
204 }
198} 205}
199 206
200void SceneHolder::setEatingOrder(QList<Color::Color> &order) 207void SceneHolder::setEatingOrder(QList<Color::Color> &order)