diff options
| author | manuel <manuel@mausz.at> | 2011-04-19 22:19:22 +0200 |
|---|---|---|
| committer | manuel <manuel@mausz.at> | 2011-04-19 22:19:22 +0200 |
| commit | 11224354131c29f656fb7e5e439c6946aff13458 (patch) | |
| tree | c86bad0422ef1388ed1fcd32894ea9b0436f82ca /pacman-c++/util.cpp | |
| parent | ecd74970a9c9d41637289b3186ae1ffed1d2f7e2 (diff) | |
| parent | 7a5e71759c00b2c77f7ee3287c366dd1b48b81ca (diff) | |
| download | foop-11224354131c29f656fb7e5e439c6946aff13458.tar.gz foop-11224354131c29f656fb7e5e439c6946aff13458.tar.bz2 foop-11224354131c29f656fb7e5e439c6946aff13458.zip | |
Merge branch 'master' of ssh://manuel.mausz.at/foop
Diffstat (limited to 'pacman-c++/util.cpp')
| -rw-r--r-- | pacman-c++/util.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pacman-c++/util.cpp b/pacman-c++/util.cpp index 708d005..070c716 100644 --- a/pacman-c++/util.cpp +++ b/pacman-c++/util.cpp | |||
| @@ -90,7 +90,7 @@ namespace Util | |||
| 90 | QList<QPoint> actors; | 90 | QList<QPoint> actors; |
| 91 | for(unsigned int i = 0; i < players; ++i) | 91 | for(unsigned int i = 0; i < players; ++i) |
| 92 | { | 92 | { |
| 93 | /* first remove formally placed actors from map */ | 93 | /* first remove formerly placed actors from map */ |
| 94 | foreach(QPoint pos, actors) | 94 | foreach(QPoint pos, actors) |
| 95 | map[pos.x()][pos.y()] = Transmission::none; | 95 | map[pos.x()][pos.y()] = Transmission::none; |
| 96 | actors.clear(); | 96 | actors.clear(); |
| @@ -144,10 +144,11 @@ namespace Util | |||
| 144 | for (unsigned int y = 0; y < Constants::map_size.height; ++y) | 144 | for (unsigned int y = 0; y < Constants::map_size.height; ++y) |
| 145 | { | 145 | { |
| 146 | Transmission::field_t &cur = map[x][y]; | 146 | Transmission::field_t &cur = map[x][y]; |
| 147 | if (cur == Transmission::none) | 147 | if (cur == Transmission::none) { |
| 148 | cur = type; | 148 | cur = type; |
| 149 | else if (cur == Transmission::point) | 149 | } else if (cur == Transmission::point) { |
| 150 | cur = Transmission::none; | 150 | cur = Transmission::none; |
| 151 | } | ||
| 151 | } | 152 | } |
| 152 | } | 153 | } |
| 153 | } | 154 | } |
