Changeset edfd1d0 in network-game for server

Timestamp:

Dec 25, 2012, 6:27:14 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

4c202e0

Parents:

baaf6c8

Message:

Moved the Player class to the common directory, added a position to Player, added a new message type for sending player info, and made the server broadcast player positions everytime it receives and replies to a message

Location:

server

Files:

• DataAccess.h (modified) (1 diff)
• makefile (modified) (1 diff)
• server.cpp (modified) (5 diffs)

server/DataAccess.h

@@ -6 +6 @@
 #include <mysql/mysql.h>
 
-#include "Player.h"
+#include "../common/Player.h"
 
 using namespace std;

server/makefile

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

server/server.cpp

@@ -7 +7 @@
 #include <vector>
 #include <algorithm>
-
-#include <fcntl.h>
-#include <assert.h>
+#include <cstring>
 
 #include <sys/socket.h>
@@ -16 +14 @@
 #include <arpa/inet.h>
 
+/*
 #include <openssl/bio.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+*/
 
 #include "../common/Compiler.h"
+#include "../common/Common.h"
 #include "../common/Message.h"
-#include "../common/Common.h"
-
-#include "Player.h"
+#include "../common/Player.h"
+
 #include "DataAccess.h"
 
@@ -63 +63 @@
 
    return NULL;
+}
+
+void broadcastPlayerPositions(vector<Player> &vec, int sock)
+{
+   vector<Player>::iterator it, it2;
+   NETWORK_MSG serverMsg;
+
+   serverMsg.type = MSG_TYPE_PLAYER;   
+
+   for (it = vec.begin(); it != vec.end(); it++)
+   {
+      strncpy(serverMsg.buffer, (char*)&*it, sizeof(Player));
+
+      for (it2 = vec.begin(); it2 != vec.end(); it2++)
+      {
+         if ( sendMessage(&serverMsg, sock, &(it2->addr)) < 0 )
+            error("sendMessage");
+      }
+   }
 }
 
@@ -73 +92 @@
    vector<Player> vctPlayers;
 
-   SSL_load_error_strings();
-   ERR_load_BIO_strings();
-   OpenSSL_add_all_algorithms();
+   //SSL_load_error_strings();
+   //ERR_load_BIO_strings();
+   //OpenSSL_add_all_algorithms();
 
    if (argc < 2) {
@@ -127 +146 @@
                error("sendMessage");
          }
-      }
-
+
+         broadcastPlayerPositions(vctPlayers, sock);
+      }
    }