Changeset 521c88b in network-game

Timestamp:

Jun 22, 2013, 1:26:58 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

7ca5d21

Parents:

109e8a3

Message:

Upon player registration, the server stores the selected player class and no longer generates a random player class every time the player logs in

Files:

• common/Player.cpp (modified) (1 diff)
• server/DataAccess.cpp (modified) (3 diffs)
• server/DataAccess.h (modified) (1 diff)
• server/server.cpp (modified) (2 diffs)

common/Player.cpp

@@ -124 +124 @@
          break;
       case CLASS_NONE:
-         cout << "No clas" << endl;
+         cout << "No class" << endl;
          break;
       dafault:

server/DataAccess.cpp

@@ -24 +24 @@
 }
 
-int DataAccess::insertPlayer(string username, string password)
+int DataAccess::insertPlayer(string username, string password, Player::PlayerClass playerClass)
 {
    ostringstream oss;
@@ -46 +46 @@
    string encrypted(crypt(password.c_str(), salt.c_str()));
 
-   oss << "'" << username << "', '" << encrypted << "'";
+   oss << "'" << username << "', '" << encrypted << "', " << playerClass;
 
-   return insert("users", "name, password", oss.str());
+   return insert("users", "name, password, class", oss.str());
 }
 
@@ -84 +84 @@
       cout << "Creating a new player" << endl;
       p = new Player(string(row[1]), string(row[2]));
+      p->setClass((Player::PlayerClass)atoi(row[3]));
+      cout << "Class from db: " << atoi(row[3]) << endl;
+      cout << "Player class: " << p->playerClass << endl;
       cout << "Created new player" << endl;
    }else {

server/DataAccess.h

@@ -16 +16 @@
    ~DataAccess();
 
-   int insertPlayer(string username, string password);
+   int insertPlayer(string username, string password, Player::PlayerClass playerClass);
    int updatePlayer(string username, string password);
 

server/server.cpp

@@ -529 +529 @@
          string username(clientMsg.buffer);
          string password(strchr(clientMsg.buffer, '\0')+1);
+         Player::PlayerClass playerClass;
+
+         memcpy(&playerClass, clientMsg.buffer+username.length()+password.length()+2, 4);
 
          cout << "username: " << username << endl;
          cout << "password: " << password << endl;
 
-         int error = da.insertPlayer(username, password);
+         if (playerClass == Player::CLASS_WARRIOR)
+            cout << "class: WARRIOR" << endl;
+         else if (playerClass == Player::CLASS_RANGER)
+            cout << "class: RANGER" << endl;
+         else
+            cout << "Unknown player class detected" << endl;
+
+         int error = da.insertPlayer(username, password, playerClass);
 
          if (!error)
@@ -574 +584 @@
             // choose a random team (either 0 or 1)
             p->team = rand() % 2;
-
-            // choose a random class
-            int intClass = rand() % 2;
-            switch (intClass) {
-               case 0:
-                  p->setClass(Player::CLASS_WARRIOR);
-                  break;
-               case 1:
-                  p->setClass(Player::CLASS_RANGER);
-                  break;
-            }
 
             // tell the new player about all the existing players