Updated the todo file for finished tasks

[irc/gameservirc.git] / gameserv / player.cpp

diff --git a/gameserv/player.cpp b/gameserv/player.cpp
index 5dbf6d5ce362b2cbf5da7e46a902cbc498e8d89e..e7376376312c76eb0a1adde48edd0293121ebc20 100644 (file)
--- a/gameserv/player.cpp
+++ b/gameserv/player.cpp
@@ -1,11 +1,14 @@
 #include "player.h"
-#include <stdlib.h>
+#include "pouch.h"
+#include "extern.h"
+#include "flags.h"
+#include <string>
 #include <stdio.h>
 
-Player::Player(aClient *user)
-{
-    name = new char [64];
+using namespace std;
 
+void Player::reset()
+{
     exp = 1;
     gold = 0;
     bank = 500;
@@ -16,57 +19,83 @@ Player::Player(aClient *user)
     armor = 1;
     weapon = 1;
     level = 1;
-    alive = 1;
-    started = 1; // Possibly deprecated
-    forest_fights = 100;
+    forest_fights = forestfights;
     player_fights = 3;
     fight = NULL;
     master = NULL;
     battle = NULL;
+    flags = 0;
+    lastcommand = 0;
+    lastlogin = 0;
+    setAlive(this);
+    inventory.reset();
+}
+
+Player::Player()
+{
+    setData(NULL);
+
+    #ifdef DEBUGMODE
+       log("New Player: %s", name.c_str());
+    #endif
+}
+
+Player::Player(aClient *user)
+{
 
     if (user)
-       strcpy(name, user->getNick());
-    else
     {
-       int num = rand() % 32767;
-       sprintf(name, "Player%d", num);
+       setData(user->stats);
+       name = user->getNick();
     }
-    cout << "New Player: " << name << endl << flush;
+    else
+       setData(NULL);
 }
+
 Player::Player(char *n)
 {
-    name = new char [64];
+    reset(); // Set defaults
 
-    exp = 1;
-    gold = 0;
-    bank = 500;
-    hp = 10;
-    maxhp = 10;
-    strength = 0;
-    defense = 0;
-    armor = 1;
-    weapon = 1;
-    level = 1;
-    alive = 1;
-    started = 1; // Possibly deprecated
-    forest_fights = 100;
-    player_fights = 3;
-    fight = NULL;
-    master = NULL;
-    battle = NULL;
-    strcpy(name, n);
+    name = n;
+
+    #ifdef DEBUGMODE
+       log("New Player: %s", name.c_str());
+    #endif
+}
 
-    cout << "New Player: " << name << endl << flush;
+Player::Player(string n)
+{
+    reset();
+    name = n;
+    #ifdef DEBUGMODE
+       log("New Player: %s", name.c_str());
+    #endif
 }
 
 Player::~Player()
-{    delete name;   }
+{   
+    #ifdef DEBUGMODE
+       string *output;
+       output = new string("Deleting Player");
+    #endif
+ 
+    #ifdef DEBUGMODE
+        *output += ": " + name;
+    #endif
+
+    #ifdef DEBUGMODE
+       *output += "    Password: " + password;
+       log ("%s", output->c_str());
+       delete output;
+    #endif
+}
 
 void Player::setData(Player *right)
 {
     if (right)
     {
-        strcpy(name, right->name);
+       name = right->name;
+       password = right->password;
         exp = right->exp;
         gold = right->gold;
         bank = right->bank;
@@ -77,33 +106,91 @@ void Player::setData(Player *right)
         armor = right->armor;
         weapon = right->weapon;
         level = right->level;
-        alive = right->alive;
-        started = right->started; // Possibly obsoleted
         forest_fights = right->forest_fights;
         player_fights = right->player_fights;
-       cout << "Setting Player data for " << right->name << endl;
+       flags = right->flags;
+       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;
+       snprintf(temp, 16, "Player: %d", num);
+       name = temp;
+       delete []temp;
     }
+
+    #ifdef DEBUGMODE
+       log("Setting Player data for %s", name.c_str());
+    #endif
 }
 
-const Player &Player::operator=( const Player &right )
+monster_::~monster_()
 {
-    if (&right != this)
-    {
-       strcpy(name, right.name);
-       exp = right.exp;
-       gold = right.gold;
-       bank = right.bank;
-       hp = right.hp;
-       maxhp = right.maxhp;
-       strength = right.strength;
-       defense = right.defense;
-       armor = right.armor;
-       weapon = right.weapon;
-       level = right.level;
-       alive = right.alive;
-       started = right.started; // Possibly obsoleted
-       forest_fights = right.forest_fights;
-       player_fights = right.player_fights;
-    }
-    return *this;    // Enables Cascading ( x = y = z;)
+}
+
+monster_::monster_()
+{
+    name.erase();
+    weapon.erase();
+    death.erase();
+    strength = 0;
+    exp = 0;
+    gold = 0;
+    maxhp = hp = 0;
+}
+
+monster_::monster_(monster_ *m)
+{
+    name = m->name;
+    weapon = m->weapon;
+    death = m->death;
+    strength = m->strength;
+    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;
+    maxhp = m.maxhp;
+    hp = m.hp;
+    gold = m.gold;
+    exp = m.exp;
+}
+
+long int Player::setFlags(long int newflags)
+{
+    flags = newflags;
+    return getFlags();
+}
+
+long int Player::addFlag(long int flag)
+{
+    flags |= flag;
+    return getFlags();
+}
+
+long int Player::remFlag(long int flag)
+{
+    flags &= ~flag;
+    return getFlags();
+}
+
+Pouch::Pouch(int h, int s, int d)
+{
+    setHealing(h);
+    setStrength(s);
+    setDefense(d);
 }