Changeset edfd1d0 in network-game for common

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:

common

Files:

• Common.cpp (added)
• Common.h (modified) (1 diff)
• Message.h (modified) (1 diff)
• Player.cpp (moved) (moved from server/Player.cpp ) (3 diffs)
• Player.h (moved) (moved from server/Player.h ) (2 diffs)

common/Common.h

@@ -2 +2 @@
 #define _COMMON_H
 
-void set_nonblock(int sock)
+#include <fcntl.h>
+#include <assert.h>
+
+void set_nonblock(int sock);
+
+typedef struct
 {
-   #ifdef WIN32
-      unsigned long mode = 1;
-      ioctlsocket(sock, FIONBIO, &mode);
-   #else
-      int flags;
-      flags = fcntl(sock, F_GETFL,0);
-      assert(flags != -1);
-      fcntl(sock, F_SETFL, flags | O_NONBLOCK);
-   #endif
-}
+   int x;
+   int y;
+} PLAYER_POS;
 
 #endif

common/Message.h

@@ -6 +6 @@
 #define MSG_TYPE_LOGOUT       3
 #define MSG_TYPE_CHAT         4
+#define MSG_TYPE_PLAYER       5
 
 typedef struct

common/Player.cpp

@@ -10 +10 @@
    this->name = name;
    this->password = password;
+   this->pos.x = 200;
+   this->pos.y = 200;
 
    cout << "Created new player: " << this->name << endl;
@@ -18 +20 @@
    this->name = name;
    this->password = "";
+   this->pos.x = 200;
+   this->pos.y = 200;
    this->addr = addr;
 
@@ -31 +35 @@
    this->addr = addr;
 }
+
+void Player::clearSensitiveInfo()
+{
+   this->password = "";
+   this->addr.sin_family = 0;
+   this->addr.sin_port = 0;
+   this->addr.sin_addr.s_addr = 0;
+}

common/Player.h

@@ -4 +4 @@
 #include <netinet/in.h>
 #include <string>
+
+#include "Common.h"
 
 using namespace std;
@@ -14 +16 @@
 
    void setAddr(sockaddr_in addr);
+   void clearSensitiveInfo();
 
    string name;
    string password;
    sockaddr_in addr;
+   PLAYER_POS pos;
 };