Changeset 46d6469 in network-game for common/MessageProcessor.h

Timestamp:

Jul 26, 2013, 6:28:39 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

9fe1807

Parents:

411c1ae

Message:

Some bug fixes for MessageProcessor. MessageContainer is now in its own files.

File:

• common/MessageProcessor.h (modified) (2 diffs)

common/MessageProcessor.h

@@ -4 +4 @@
 #include <map>
 
-#include "Compiler.h"
-
-#if defined WINDOWS
-   #include <winsock2.h>
-   #include <WS2tcpip.h>
-#elif defined LINUX
-   #include <netinet/in.h>
-#endif
-
-#define MSG_TYPE_ACK               1
-#define MSG_TYPE_REGISTER          2
-#define MSG_TYPE_LOGIN             3
-#define MSG_TYPE_LOGOUT            4
-#define MSG_TYPE_CHAT              5
-#define MSG_TYPE_PLAYER            6  // server sends this to update player positions
-#define MSG_TYPE_PLAYER_MOVE       7  // client sends this when a player wants to move
-#define MSG_TYPE_OBJECT            8
-#define MSG_TYPE_REMOVE_OBJECT     9
-#define MSG_TYPE_PICKUP_FLAG       10
-#define MSG_TYPE_DROP_FLAG         11
-#define MSG_TYPE_SCORE             12
-#define MSG_TYPE_START_ATTACK      13
-#define MSG_TYPE_ATTACK            14
-#define MSG_TYPE_PROJECTILE        15
-#define MSG_TYPE_REMOVE_PROJECTILE 16
-
-typedef struct
-{
-   unsigned int id;
-   unsigned short type;
-   char buffer[256];
-} NETWORK_MSG;
+#include "MessageContainer.h"
 
 using namespace std;
 
 class MessageProcessor {
+private:
+   int lastUsedId;
+
+   // map from message ids to maps from player addresses to message info
+   map<int, map<unsigned long, MessageContainer> > sentMessages;
+
+   // map from message ids to the time each mesage was acked
+   map<unsigned int, unsigned long long> ackedMessages;
+
+   unsigned long pid;
+
 public:
    MessageProcessor();
@@ -48 +28 @@
    void resendUnackedMessages(int sock);
    void cleanAckedMessages();
-
-private:
-   // this should eventually just replace the Message struct
-   class MessageContainer {
-   public:
-      MessageContainer() {
-      }
-
-      MessageContainer(const MessageContainer& mc) {
-         this->msg = mc.msg;
-         this->clientAddr = mc.clientAddr;
-      }
-
-      MessageContainer(NETWORK_MSG msg, struct sockaddr_in clientAddr) {
-         this->clientAddr = clientAddr;
-         this->msg = msg;
-      }
-
-      ~MessageContainer() {
-      }
-
-      NETWORK_MSG msg;
-      struct sockaddr_in clientAddr;
-      bool isAcked;
-      unsigned long long timeAcked;
-   };
-
-   int lastUsedId;
-
-   // map from message ids to maps from player addresses to message info
-   map<int, map<unsigned long, MessageContainer> > sentMessages;
-
-   // map from message ids to the time each mesage was acked
-   map<unsigned int, unsigned long long> ackedMessages;
 };