Changeset 787806f in network-game

Timestamp:

Jul 2, 2013, 10:24:22 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

1a3c42d

Parents:

f3cf1a5

Message:

Added an ACK message type and a skeleton MessageProcessor class

Files:

• common/Message.cpp (modified) (1 diff)
• common/Message.h (modified) (2 diffs)
• server/makefile (modified) (2 diffs)

common/Message.cpp

@@ -24 +24 @@
 }
 
-int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest)
+int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *source)
 {
    socklen_t socklen = sizeof(struct sockaddr_in);
 
    // assume we don't care about the value of socklen
-   int ret =  recvfrom(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, &socklen);
+   int ret =  recvfrom(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)source, &socklen);
 
    return ret;

common/Message.h

@@ -2 +2 @@
 #define _MESSAGE_H
 
-#define MSG_TYPE_REGISTER          1
-#define MSG_TYPE_LOGIN             2
-#define MSG_TYPE_LOGOUT            3
-#define MSG_TYPE_CHAT              4
-#define MSG_TYPE_PLAYER            5  // server sends this to update player positions
-#define MSG_TYPE_PLAYER_MOVE       6  // client sends this when a player wants to move
-#define MSG_TYPE_OBJECT            7
-#define MSG_TYPE_REMOVE_OBJECT     8
-#define MSG_TYPE_PICKUP_FLAG       9
-#define MSG_TYPE_DROP_FLAG         10
-#define MSG_TYPE_SCORE             11
-#define MSG_TYPE_START_ATTACK      12
-#define MSG_TYPE_ATTACK            13
-#define MSG_TYPE_PROJECTILE        14
-#define MSG_TYPE_REMOVE_PROJECTILE 15
+#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
@@ -26 +27 @@
 int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest);
 
-int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest);
+int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *source);
 
 #endif

server/makefile

@@ -3 +3 @@
 FLAGS = $(LIB_FLAGS)
 COMMON_PATH = ../common
-DEPENDENCIES = Common.o Message.o Player.o WorldMap.o DataAccess.o Projectile.o
+DEPENDENCIES = Common.o Message.o MessageProcessor.o Player.o WorldMap.o DataAccess.o Projectile.o
 
 server : server.cpp $(DEPENDENCIES)
@@ -12 +12 @@
 
 Message.o : $(COMMON_PATH)/Message.cpp
+        $(CC) -c -o $@ $?
+
+MessageProcessor.o : $(COMMON_PATH)/MessageProcessor.cpp
         $(CC) -c -o $@ $?