Changes in server/server.cpp [8f85180:01d0d00] in network-game

File:

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

server/server.cpp

@@ -6 +6 @@
 #include <sstream>
 #include <cstring>
-#include <cmath>
 
 #include <vector>
@@ -15 +14 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
-
-#include <crypt.h>
 
 /*
@@ -27 +24 @@
 #include "../common/Common.h"
 #include "../common/Message.h"
-#include "../common/WorldMap.h"
 #include "../common/Player.h"
 
@@ -34 +30 @@
 using namespace std;
 
-bool processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, map<unsigned int, Player>& mapPlayers, WorldMap* gameMap, unsigned int& unusedId, NETWORK_MSG &serverMsg);
-
-void updateUnusedId(unsigned int& id, map<unsigned int, Player>& mapPlayers);
+bool processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, map<unsigned int, Player>& mapPlayers, unsigned int& unusedId, NETWORK_MSG &serverMsg);
+
+void updateUnusedId(unsigned int& id);
 
 // this should probably go somewhere in the common folder
@@ -98 +94 @@
    NETWORK_MSG clientMsg, serverMsg;
    map<unsigned int, Player> mapPlayers;
-   unsigned int unusedId = 1;
+   unsigned int unusedId = 0;
 
    //SSL_load_error_strings();
@@ -108 +104 @@
       exit(1);
    }
-
-   WorldMap* gameMap = NULL; //WorldMap::createDefaultMap();
  
    sock = socket(AF_INET, SOCK_DGRAM, 0);
@@ -133 +127 @@
          cout << "Got a message" << endl;
 
-         broadcastResponse = processMessage(clientMsg, from, mapPlayers, gameMap, unusedId, serverMsg);
-
-         // probably replace this with a function that prints based on the
-         // message type
+         broadcastResponse = processMessage(clientMsg, from, mapPlayers, unusedId, serverMsg);
+
          cout << "msg: " << serverMsg.buffer << endl;
-         cout << "broadcastResponse: " << broadcastResponse << endl;
+
          if (broadcastResponse)
          {
@@ -144 +136 @@
 
             map<unsigned int, Player>::iterator it;
+
             for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
             {
@@ -158 +151 @@
          }
 
-         // update player positions
-         map<unsigned int, Player>::iterator it;
-         for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
-         {
-            it->second.move();
-         }
-
          broadcastPlayerPositions(mapPlayers, sock);
       }
@@ -172 +158 @@
 }
 
-bool processMessage(const NETWORK_MSG& clientMsg, const struct sockaddr_in& from, map<unsigned int, Player>& mapPlayers, WorldMap* gameMap, unsigned int& unusedId, NETWORK_MSG& serverMsg)
+bool processMessage(const NETWORK_MSG& clientMsg, const struct sockaddr_in& from, map<unsigned int, Player>& mapPlayers, unsigned int& unusedId, NETWORK_MSG& serverMsg)
 {
    DataAccess da;
@@ -209 +195 @@
       case MSG_TYPE_LOGIN:
       {
-         cout << "Got login message" << endl;
-
          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 || !da.verifyPassword(password, p->password))
+         if (p == NULL || p->password != password)
          {
             strcpy(serverMsg.buffer, "Incorrect username or password");
@@ -227 +212 @@
          {
             p->setAddr(from);
-            updateUnusedId(unusedId, mapPlayers);
             p->id = unusedId;
             mapPlayers[unusedId] = *p;
-
-            // sendd back the new player info to the user
-            p->serialize(serverMsg.buffer);
+            updateUnusedId(unusedId);
+
+            strcpy(serverMsg.buffer, "Login successful. Enjoy chatting with other players.");
          }
 
@@ -251 +235 @@
          {
             strcpy(serverMsg.buffer, "That player is not logged in. This is either a bug, or you're trying to hack the server.");
-            cout << "Player not logged in" << endl;
          }
          else if ( p->addr.sin_addr.s_addr != from.sin_addr.s_addr ||
@@ -257 +240 @@
          {
             strcpy(serverMsg.buffer, "That player is logged in using a differemt connection. This is either a bug, or you're trying to hack the server.");
-            cout << "Player logged in using a different connection" << endl;
          }
          else
@@ -265 +247 @@
             mapPlayers.erase(p->id);
             strcpy(serverMsg.buffer, "You have successfully logged out.");
-            cout << "Player logged out successfuly" << endl;
-         }
-
-         // should really be serverMsg.type = MSG_TYPE_LOGOUT;
-         serverMsg.type = MSG_TYPE_LOGIN;
+         }
 
          break;
@@ -287 +265 @@
             broadcastResponse = true;
 
-            ostringstream oss;
-            oss << p->name << ": " << clientMsg.buffer;
-
-            strcpy(serverMsg.buffer, oss.str().c_str());
+            stringstream ss;
+            ss << p->name << ": " << clientMsg.buffer;
+
+            strcpy(serverMsg.buffer, ss.str().c_str());
          }      
 
@@ -297 +275 @@
          break;
       }
-      case MSG_TYPE_PLAYER_MOVE:
-      {
-         cout << "Got a move message" << endl;
-
-         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 )
-         {
-            // we need to make sure the player can move here
-            if (0 <= x && x < 300 && 0 <= y && y < 300 &&
-               gameMap->getElement(x/25, y/25) == WorldMap::TERRAIN_GRASS)
-            {
-               // first we get the correct vector 
-               mapPlayers[id].target.x = x;
-               mapPlayers[id].target.y = y;
-               int xDiff = mapPlayers[id].target.x - mapPlayers[id].pos.x;
-               int yDiff = mapPlayers[id].target.y - mapPlayers[id].pos.y;
-               cout << "xDiff: " << xDiff << endl;               
-               cout << "yDiff: " << yDiff << endl;               
-
-               // then we get the correct angle
-               double angle = atan2(yDiff, xDiff);
-               cout << "angle: " << angle << endl;               
-
-               // finally we use the angle to determine
-               // how much the player moves
-               // the player will move 50 pixels in the correct direction
-               mapPlayers[id].pos.x += cos(angle)*50;
-               mapPlayers[id].pos.y += sin(angle)*50;
-               cout << "new x: " << mapPlayers[id].pos.x << endl;               
-               cout << "new y: " << mapPlayers[id].pos.y << endl;               
-
-               serverMsg.type = MSG_TYPE_PLAYER_MOVE;
-               
-               memcpy(serverMsg.buffer, &id, 4);
-               memcpy(serverMsg.buffer+4, &mapPlayers[id].pos.x, 4);
-               memcpy(serverMsg.buffer+8, &mapPlayers[id].pos.y, 4);
-               //memcpy(serverMsg.buffer, clientMsg.buffer, 12);
-
-               broadcastResponse = true;
-            }
-            else
-               cout << "Bad terrain detected" << endl;
-         }
-         else  // nned to send back a message indicating failure
-            cout << "Player id (" << id << ") doesn't match sender" << endl;
-
-         break;
-      }
       default:
       {
@@ -370 +285 @@
    }
 
-   cout << "Got to the end of the switch" << endl;
-
    return broadcastResponse;
 }
 
-void updateUnusedId(unsigned int& id, map<unsigned int, Player>& mapPlayers)
-{
-   while (mapPlayers.find(id) != mapPlayers.end())
-      id++;
-}
+void updateUnusedId(unsigned int& id)
+{
+   id = 5;
+}