Changeset c9f6a1c in network-game

Timestamp:

Dec 23, 2013, 8:05:55 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

3e44a59

Parents:

8ce793b

Message:

New GameSummary class for storing game results

Files:

• common/Game.cpp (modified) (2 diffs)
• common/Game.h (modified) (2 diffs)
• common/GameSummary.cpp (added)
• common/GameSummary.h (added)
• server/makefile (modified) (2 diffs)
• server/server.cpp (modified) (2 diffs)

common/Game.cpp

@@ -73 +73 @@
 }
 
-int Game::getRedScore() {
+unsigned int Game::getRedScore() {
    return this->redScore;
 }
 
-int Game::getBlueScore() {
+unsigned int Game::getBlueScore() {
    return this->blueScore;
 }
@@ -89 +89 @@
 }
 
-void Game::setRedScore(int score) {
+void Game::setRedScore(unsigned int score) {
    this->redScore = score;
 }
 
-void Game::setBlueScore(int score) {
+void Game::setBlueScore(unsigned int score) {
    this->blueScore = score;
 }

common/Game.h

@@ -24 +24 @@
    map<unsigned int, Projectile> projectiles;
    WorldMap* worldMap;
-   int blueScore;
-   int redScore;
+   unsigned int blueScore;
+   unsigned int redScore;
    unsigned int unusedProjectileId;
 
@@ -36 +36 @@
    string getName();
    int getNumPlayers();
-   int getBlueScore();
-   int getRedScore();
+   unsigned int getBlueScore();
+   unsigned int getRedScore();
    WorldMap* getMap();
 
    void setId(unsigned int id);
-   void setBlueScore(int score);
-   void setRedScore(int score);
+   void setBlueScore(unsigned int score);
+   void setRedScore(unsigned int score);
 
    map<unsigned int, Player*>& getPlayers();

server/makefile

@@ -1 +1 @@
 CC = g++
-LIB_FLAGS = -lssl -lmysqlclient -lcrypt -lrt
+#LIB_FLAGS = -lssl -lmysqlclient -lcrypt -lrt
+LIB_FLAGS = -lmysqlclient -lcrypt -lrt
 FLAGS = $(LIB_FLAGS)
 COMMON_PATH = ../common
-DEPENDENCIES = Common.o MessageContainer.o MessageProcessor.o Player.o WorldMap.o DataAccess.o Projectile.o Game.o
+DEPENDENCIES = Common.o MessageContainer.o MessageProcessor.o Player.o WorldMap.o DataAccess.o Projectile.o Game.o GameSummary.o
 
 server : server.cpp $(DEPENDENCIES)
@@ -29 +30 @@
         $(CC) -c -o $@ $?
 
+GameSummary.o : $(COMMON_PATH)/GameSummary.cpp
+        $(CC) -c -o $@ $?
+
 %.o : %.cpp
         $(CC) -c -o $@ $?

server/server.cpp

@@ -36 +36 @@
 #include "../common/Projectile.h"
 #include "../common/Game.h"
+#include "../common/GameSummary.h"
 
 #include "DataAccess.h"
@@ -377 +378 @@
 
                         serverMsg.type = MSG_TYPE_FINISH_GAME;
+
+                        // I should create an instance of the GameSummary object here and just serialize it into this message
                         memcpy(serverMsg.buffer+4, &winningTeam, 4);
                         memcpy(serverMsg.buffer+4, &scoreBlue, 4);