summaryrefslogtreecommitdiffstats
path: root/pacman-c++/server.cpp
diff options
context:
space:
mode:
authortotycro <totycro@unknown-horizons.org>2011-04-09 15:38:52 +0200
committertotycro <totycro@unknown-horizons.org>2011-04-09 15:38:52 +0200
commit64a02ded2453082fe13e8a8b408933e8fada131c (patch)
tree8ad71a72377cf094a699d21482a282297420b07d /pacman-c++/server.cpp
parentb0d6e4fcf33d21b24d2e9bbf7c5abf2065f0a4b3 (diff)
downloadfoop-64a02ded2453082fe13e8a8b408933e8fada131c.tar.gz
foop-64a02ded2453082fe13e8a8b408933e8fada131c.tar.bz2
foop-64a02ded2453082fe13e8a8b408933e8fada131c.zip
hackishly disabled audio for srv
made test movement work
Diffstat (limited to 'pacman-c++/server.cpp')
-rw-r--r--pacman-c++/server.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index 2c16453..be24da0 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -6,8 +6,12 @@ Server::Server(QWidget *parent)
6 : SceneHolder(parent) 6 : SceneHolder(parent)
7{ 7{
8 updateMap(Util::createDummyMap()); 8 updateMap(Util::createDummyMap());
9
9 Transmission::map_t map = calculateUpdates(); 10 Transmission::map_t map = calculateUpdates();
10 updateMap(map); 11 for (int i=0; i<10; ++i) {
12 qDebug() << "doing srv update";
13 updateMap(map);
14 }
11} 15}
12 16
13QMap< Color::Color, Actor::Movement > Server::getActorDirections() 17QMap< Color::Color, Actor::Movement > Server::getActorDirections()
@@ -17,7 +21,6 @@ QMap< Color::Color, Actor::Movement > Server::getActorDirections()
17 return directions; 21 return directions;
18} 22}
19 23
20
21Transmission::map_t Server::calculateUpdates() 24Transmission::map_t Server::calculateUpdates()
22{ 25{
23 Transmission::map_t map = Util::createEmptyMap(); 26 Transmission::map_t map = Util::createEmptyMap();
@@ -40,7 +43,9 @@ Transmission::map_t Server::calculateUpdates()
40 case Actor::None: break; 43 case Actor::None: break;
41 default: Q_ASSERT(false); 44 default: Q_ASSERT(false);
42 } 45 }
43 map[newMapPosition.x()][newMapPosition.y()] = Transmission::pacman | i.key() ; 46 map[newMapPosition.x()][newMapPosition.y()] =
47 Transmission::pacman | i.key() |
48 Util::actorMovementToTransmission(i.value()) ;
44 49
45 } 50 }
46 return map; 51 return map;