X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/4025195255323de684e16d0845717a4eee057366..26b1738621ecdeb4fdf857d76a6f9b882a296da6:/gameserv/player.cpp

diff --git a/gameserv/player.cpp b/gameserv/player.cpp
index 75ab302..3d3887b 100644
--- a/gameserv/player.cpp
+++ b/gameserv/player.cpp
@@ -1,15 +1,15 @@
+#include "item.h"
 #include "player.h"
 #include "pouch.h"
 #include "extern.h"
 #include "flags.h"
-#include <stdlib.h>
+#include <string>
 #include <stdio.h>
 
+using namespace std;
+
 void Player::reset()
 {
-    memset(name, 0, 256);
-    memset(password, 0, 256);
-
     exp = 1;
     gold = 0;
     bank = 500;
@@ -17,8 +17,8 @@ void Player::reset()
     maxhp = 10;
     strength = 0;
     defense = 0;
-    armor = 1;
-    weapon = 1;
+    arm = 1;
+    wea = 1;
     level = 1;
     forest_fights = forestfights;
     player_fights = 3;
@@ -27,89 +27,76 @@ void Player::reset()
     battle = NULL;
     flags = 0;
     lastcommand = 0;
+    lastlogin = 0;
     setAlive(this);
     inventory.reset();
 }
 
 Player::Player()
 {
-    name = new char[256];
-    password = new char[256];
     setData(NULL);
 
     #ifdef DEBUGMODE
-	log("New Player: %s", name);
+	log("New Player: %s", name.c_str());
     #endif
 }
 
-Player::Player(aClient *user)
+Player::Player(char *n)
 {
+    reset(); // Set defaults
 
-    name = new char[256];
-    password = new char[256];
-
-    if (user)
-    {
-	setData(user->stats);
-	strcpy(name, user->getNick());
-    }
-    else
-	setData(NULL);
+    name = n;
 
+    #ifdef DEBUGMODE
+	log("New Player: %s", name.c_str());
+    #endif
 }
 
-Player::Player(char *n)
+Player::Player(string n)
 {
-    name = new char[256];
-    password = new char[256];
-
-    reset(); // Set defaults
-
-    strcpy(name, n);
-
+    reset();
+    name = n;
     #ifdef DEBUGMODE
-	log("New Player: %s", name);
+	log("New Player: %s", name.c_str());
     #endif
 }
 
 Player::~Player()
 {   
     #ifdef DEBUGMODE
-	char *output;
-	output = new char[strlen(name) + strlen(password) + 48];
-	strcpy(output, "Deleting Player");
+	string *output;
+	output = new string("Deleting Player");
     #endif
  
-    if (name != NULL)
-    {
-	#ifdef DEBUGMODE
-	    sprintf(output, "%s: %s", output, name);
-	#endif
-
-	delete [] name;
-    }
-
-    if (password != NULL)
-    {
-	#ifdef DEBUGMODE
-	    sprintf(output, "%s    Password: %s", output, password);
-	#endif
-
-	delete [] password;
-    }
+    #ifdef DEBUGMODE
+	 *output += ": " + name;
+    #endif
 
     #ifdef DEBUGMODE
-	log ("%s", output);
-	delete [] output;
+	*output += "    Password: " + password;
+	log ("%s", output->c_str());
+	delete output;
     #endif
 }
+void Player::setPassword(const char *p)
+{
+      static char saltChars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUV\
+WXYZ0123456789./";
+      static char salt[3];
+
+      salt[0] = saltChars[rand() % strlen(saltChars)];
+      salt[1] = saltChars[rand() % strlen(saltChars)];
+      salt[2] = '\0';
+
+      password = crypt(p, salt);
+}
 
 void Player::setData(Player *right)
 {
     if (right)
     {
-        strcpy(name, right->name);
-        strcpy(password, right->password);
+	name = right->name;
+	password = right->password;
         exp = right->exp;
         gold = right->gold;
         bank = right->bank;
@@ -117,8 +104,8 @@ void Player::setData(Player *right)
         maxhp = right->maxhp;
         strength = right->strength;
         defense = right->defense;
-        armor = right->armor;
-        weapon = right->weapon;
+        arm = right->arm;
+        wea = right->wea;
         level = right->level;
         forest_fights = right->forest_fights;
         player_fights = right->player_fights;
@@ -126,55 +113,67 @@ void Player::setData(Player *right)
 	inventory.setInventory(&right->inventory);
 	client = right->client;
 	lastcommand = right->lastcommand;
+	lastlogin = right->lastlogin;
     }
     else
     {
+	char *temp;
         reset();
+	temp = new char[16];
 	client = NULL;
 	int num = rand() % 32767;
-	sprintf(name, "Player%d", num);
+	snprintf(temp, 16, "Player: %d", num);
+	name = temp;
+	delete []temp;
     }
 
     #ifdef DEBUGMODE
-	log("Setting Player data for %s", name);
+	log("Setting Player data for %s", name.c_str());
     #endif
 }
 
 monster_::~monster_()
 {
-    delete name;
-    delete weapon;
-    delete death;
 }
 
 monster_::monster_()
 {
-    name = new char[64];
-    weapon = new char[64];
-    death = new char[512];
-
-    memset(name, 0, 64);
-    memset(weapon, 0, 64);
-    memset(death, 0, 512);
+    name.erase();
+    weapon.erase();
+    death.erase();
+    strength = 0;
+    defense = 0;
+    exp = 0;
+    gold = 0;
+    maxhp = hp = 0;
 }
 
 monster_::monster_(monster_ *m)
 {
-    name = new char[strlen(m->name) + 1];
-    weapon = new char[strlen(m->weapon) + 1];
-    death = new char[strlen(m->death) + 1];
-
-    strcpy(name, m->name);
-    strcpy(weapon, m->weapon);
-    strcpy(death, m->death);
-
+    name = m->name;
+    weapon = m->weapon;
+    death = m->death;
     strength = m->strength;
+    defense = m->defense;
     maxhp = m->maxhp;
     hp = m->hp;
     gold = m->gold;
     exp = m->exp;
 }
 
+monster_::monster_(monster_ &m)
+{
+    name = m.name;
+    weapon = m.weapon;
+    death = m.death;
+    strength = m.strength;
+    defense = m.defense;
+    maxhp = m.maxhp;
+    hp = m.hp;
+    gold = m.gold;
+    exp = m.exp;
+}
+
 long int Player::setFlags(long int newflags)
 {
     flags = newflags;