From eaf133fd08c9708fe718ef47451bed7ea803a46a Mon Sep 17 00:00:00 2001 From: totycro Date: Tue, 19 Apr 2011 21:56:37 +0200 Subject: Added rounds rounds will end when all points are removed TODO: end round when a pacman gets eaten --- pacman-c++/util.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pacman-c++/util.cpp') diff --git a/pacman-c++/util.cpp b/pacman-c++/util.cpp index 708d005..fcc1aff 100644 --- a/pacman-c++/util.cpp +++ b/pacman-c++/util.cpp @@ -90,7 +90,7 @@ namespace Util QList actors; for(unsigned int i = 0; i < players; ++i) { - /* first remove formally placed actors from map */ + /* first remove formerly placed actors from map */ foreach(QPoint pos, actors) map[pos.x()][pos.y()] = Transmission::none; actors.clear(); @@ -139,15 +139,19 @@ namespace Util void fillPoints(Transmission::map_t map, Transmission::field_t type) { /* auto place normal points*/ + int i =0; 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) + if (cur == Transmission::none) { + if (++i > 10 ) continue; + cur = type; - else if (cur == Transmission::point) + } else if (cur == Transmission::point) { cur = Transmission::none; + } } } } -- cgit v1.2.3 From 7a5e71759c00b2c77f7ee3287c366dd1b48b81ca Mon Sep 17 00:00:00 2001 From: totycro Date: Tue, 19 Apr 2011 22:16:06 +0200 Subject: don't always call setPos --- pacman-c++/util.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'pacman-c++/util.cpp') diff --git a/pacman-c++/util.cpp b/pacman-c++/util.cpp index fcc1aff..070c716 100644 --- a/pacman-c++/util.cpp +++ b/pacman-c++/util.cpp @@ -139,15 +139,12 @@ namespace Util void fillPoints(Transmission::map_t map, Transmission::field_t type) { /* auto place normal points*/ - int i =0; 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) { - if (++i > 10 ) continue; - cur = type; } else if (cur == Transmission::point) { cur = Transmission::none; -- cgit v1.2.3