Changeset d05c484 in network-game for common/Game.h

Timestamp:

Jan 19, 2014, 7:40:55 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

e5697b1

Parents:

6054f1e

Message:

Some game-specific functions moved from server.cpp to the Game class and a function moved to the MessageProcessor class

File:

• common/Game.h (modified) (4 diffs)

common/Game.h

@@ -14 +14 @@
 #include "WorldMap.h"
 #include "Projectile.h"
+#include "MessageProcessor.h"
 
 using namespace std;
@@ -27 +28 @@
    unsigned int redScore;
    unsigned int unusedProjectileId;
+   MessageProcessor* msgProcessor;
 
 public:
    Game();
-   Game(string name, string filepath);
+   Game(string name, string filepath, MessageProcessor* msgProcessor);
 
    ~Game();
@@ -44 +46 @@
    void setRedScore(unsigned int score);
 
+   void addObjectToMap(WorldMap::ObjectType objectType, int x, int y);
+
    map<unsigned int, Player*>& getPlayers();
    bool addPlayer(Player* p);
@@ -55 +59 @@
    bool processPlayerMovement(Player* p, FLOAT_POSITION oldPos);
    int processFlagPickupRequest(Player* p);
+   void dealDamageToPlayer(Player* p, int damage);
+
+   bool handleGameEvents();
+   bool handlePlayerEvents(Player* p);
 
    void assignProjectileId(Projectile* p);