diff options
| author | manuel <manuel@mausz.at> | 2011-05-11 17:38:29 +0200 |
|---|---|---|
| committer | manuel <manuel@mausz.at> | 2011-05-11 17:38:29 +0200 |
| commit | ca29fc0babe8fc985a9e4656f80fc7faec4ac8a5 (patch) | |
| tree | fb48f74ffcddcd8b260ebf78062623427aeda862 /pacman-c++/server/server.h | |
| parent | 535c342a2f28e0a1e90010b2f0ff4018eeeb200a (diff) | |
| download | foop-ca29fc0babe8fc985a9e4656f80fc7faec4ac8a5.tar.gz foop-ca29fc0babe8fc985a9e4656f80fc7faec4ac8a5.tar.bz2 foop-ca29fc0babe8fc985a9e4656f80fc7faec4ac8a5.zip | |
- fix audio plugin and make that a real interface
- that fixes a duplicate statis audiomanager (1x pacman, 1x audio plugin) on windows
- display won/lost dialog upon gameend
Diffstat (limited to 'pacman-c++/server/server.h')
| -rw-r--r-- | pacman-c++/server/server.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pacman-c++/server/server.h b/pacman-c++/server/server.h index 857f23d..26c1af2 100644 --- a/pacman-c++/server/server.h +++ b/pacman-c++/server/server.h | |||
| @@ -11,8 +11,6 @@ extern "C" { | |||
| 11 | #include "enet/enet.h" | 11 | #include "enet/enet.h" |
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | class QTcpSocket; | ||
| 15 | |||
| 16 | class Server | 14 | class Server |
| 17 | : public SceneHolder | 15 | : public SceneHolder |
| 18 | { | 16 | { |
| @@ -27,8 +25,8 @@ protected slots: | |||
| 27 | void tick(); | 25 | void tick(); |
| 28 | 26 | ||
| 29 | /* receive updates of client */ | 27 | /* receive updates of client */ |
| 30 | void keyPressUpdate(); | 28 | void readClientUpdates(); |
| 31 | void keyPressUpdate(ENetEvent *event); | 29 | void processClientUpdate(ENetEvent *event); |
| 32 | 30 | ||
| 33 | protected: | 31 | protected: |
| 34 | /* block until we have connections from all clients */ | 32 | /* block until we have connections from all clients */ |
