summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pacman-c++/server.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index a4b736b..c83c70d 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -56,19 +56,16 @@ Transmission::map_t Server::calculateUpdates()
56 if (newMapPosition.y() >= visualMap[newMapPosition.x()].size()) newMapPosition.setY(visualMap[newMapPosition.x()].size()-1); 56 if (newMapPosition.y() >= visualMap[newMapPosition.x()].size()) newMapPosition.setY(visualMap[newMapPosition.x()].size()-1);
57 57
58 // <t3h g4m3 10gic> 58 // <t3h g4m3 10gic>
59 if (0 <= newMapPosition.x() && newMapPosition.x() < visualMap.size() && 59 if(dynamic_cast<Block*>(visualMap[newMapPosition.x()][newMapPosition.y()]) != 0) {
60 0 <= newMapPosition.y() && newMapPosition.y() < visualMap[newMapPosition.x()].size()) { 60 continue;
61 if(dynamic_cast<Block*>(visualMap[newMapPosition.x()][newMapPosition.y()]) != 0) {
62 continue;
63 }
64 } 61 }
65 // </t3h g4m2 10gic> 62 // </t3h g4m2 10gic>
66 63
67 if (mapPosition != newMapPosition) { 64 if (mapPosition != newMapPosition) {
68 map[mapPosition.x()][mapPosition.y()] = Transmission::empty; 65 map[mapPosition.x()][mapPosition.y()] = Transmission::empty;
69 map[newMapPosition.x()][newMapPosition.y()] = 66 map[newMapPosition.x()][newMapPosition.y()] =
70 Transmission::pacman | i.key() | 67 Transmission::pacman | i.key() |
71 Util::actorMovementToTransmission(i.value()) ; 68 Util::actorMovementToTransmission(i.value()) ;
72 } 69 }
73 } 70 }
74 return map; 71 return map;