Changeset b128109 in network-game for server/server.cpp

Timestamp:

Jan 29, 2013, 7:34:29 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

60b77d2

Parents:

5806dc2

Message:

Added MSG_TYPE_PLAYER_MOVE, which allows players to tell the server where they want to move

File:

• server/server.cpp (modified) (4 diffs)

server/server.cpp

@@ -14 +14 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
+
+#include <crypt.h>
 
 /*
@@ -129 +131 @@
          broadcastResponse = processMessage(clientMsg, from, mapPlayers, unusedId, serverMsg);
 
+         // probably replace this with a function that prints based on the
+         // message type
          cout << "msg: " << serverMsg.buffer << endl;
-
+         cout << "broadcastResponse: " << broadcastResponse << endl;
          if (broadcastResponse)
          {
@@ -197 +201 @@
          string username(clientMsg.buffer);
          string password(strchr(clientMsg.buffer, '\0')+1);
-         cout << "Player logging in: " << username << endl;
 
          Player* p = da.getPlayer(username);
 
-         if (p == NULL || p->password != password)
+         if (p == NULL || !da.verifyPassword(password, p->password))
          {
             strcpy(serverMsg.buffer, "Incorrect username or password");
@@ -272 +275 @@
             broadcastResponse = true;
 
-            stringstream ss;
-            ss << p->name << ": " << clientMsg.buffer;
-
-            strcpy(serverMsg.buffer, ss.str().c_str());
+            ostringstream oss;
+            oss << p->name << ": " << clientMsg.buffer;
+
+            strcpy(serverMsg.buffer, oss.str().c_str());
          }      
 
          serverMsg.type = MSG_TYPE_CHAT;
+
+         break;
+      }
+      case MSG_TYPE_PLAYER_MOVE:
+      {
+         istringstream iss;
+         iss.str(clientMsg.buffer);
+
+         cout << "PLAYER_MOVE" << endl;
+
+         int id, x, y;
+
+         memcpy(&id, clientMsg.buffer, 4);
+         memcpy(&x, clientMsg.buffer+4, 4);
+         memcpy(&y, clientMsg.buffer+8, 4);
+         
+         cout << "x: " << x << endl;
+         cout << "y: " << y << endl;
+         cout << "id: " << id << endl;
+
+         if ( mapPlayers[id].addr.sin_addr.s_addr == from.sin_addr.s_addr &&
+              mapPlayers[id].addr.sin_port == from.sin_port )
+         {
+            memcpy(&mapPlayers[id].pos.x, clientMsg.buffer+4, 4);
+            memcpy(&mapPlayers[id].pos.y, clientMsg.buffer+8, 4);
+
+            serverMsg.type = MSG_TYPE_PLAYER_MOVE;
+            memcpy(serverMsg.buffer, clientMsg.buffer, 12);
+
+            broadcastResponse = true;
+         }
+         else  // nned to send back a message indicating failure
+            cout << "Player id (" << id << ") doesn't match sender" << endl;
 
          break;