From c1413464930fa82073800a6c58334099bbef370b Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 7 Apr 2011 00:02:36 +0200 Subject: adding normal points --- pacman-c++/mainwidget.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'pacman-c++/mainwidget.cpp') diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp index 6ee7b7a..d0b2ad7 100644 --- a/pacman-c++/mainwidget.cpp +++ b/pacman-c++/mainwidget.cpp @@ -3,6 +3,7 @@ #include "actor.h" #include "block.h" #include "bonuspoint.h" +#include "point.h" #include "constants.h" // temporary @@ -18,7 +19,7 @@ Transmission::map_t createDummyMap() for (unsigned int y = 0; y < Constants::map_size.height; ++y) { Transmission::field_t &cur = map[x][y]; - cur = 0; + cur = Transmission::none; } } @@ -189,6 +190,16 @@ Transmission::map_t createDummyMap() map[17][15] |= Transmission::pacman; map[17][15] |= Transmission::direction_left; + for (unsigned int x = 0; x < Constants::map_size.width; ++x) + { + for (unsigned int y = 0; y < Constants::map_size.height; ++y) + { + Transmission::field_t &cur = map[x][y]; + if (cur == Transmission::none) + cur |= Transmission::point; + } + } + return map; } @@ -275,7 +286,7 @@ void MainWidget::updateMap(const Transmission::map_t& map) for (unsigned int y = 0; y < Constants::map_size.height; ++y) { const Transmission::field_t &cur = map[x][y]; - if (cur == 0) + if (cur == Transmission::none) continue; //qDebug() << "not 0 at x=" << x << ", y=" << y << ", val=" << cur; @@ -302,6 +313,8 @@ void MainWidget::updateMap(const Transmission::map_t& map) } else if (cur & Transmission::bonuspoint) item = new BonusPoint(); + else if (cur & Transmission::point) + item = new Point(); else if (cur & Transmission::pacman) { Actor *actor = m_actors.value(color, NULL); -- cgit v1.2.3