Edited the version number after a release (1.2.3)

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

diff --git a/gameserv/player.h b/gameserv/player.h
index e69b28159de5a68deb5ba9894ed13247b45c90ed..92e95b4a66fb4be3212544e9df3c0b6f9bd85cc1 100644 (file)
--- a/gameserv/player.h
+++ b/gameserv/player.h
@@ -2,21 +2,29 @@
 #define PLAYER_H
 
 #include <string.h>
-#include <iostream.h>
 #include "aClient.h"
+#include "pouch.h"
 
-typedef struct monster_  Monster;
+typedef struct monster_ Monster;
 
 class aClient; // forward declaration
 
 class Player {
 public:
-    Player(aClient *user = NULL);
+    Player();
+    Player(aClient *);
     Player(char *);
     ~Player();
     void setData(Player *);
     void reset();
 
+    long int getFlags() { return flags; };          // Returns the Client's current flags
+        // Functions also return the flags after modifying them
+    long int setFlags(long int);    // Sets the clients flags to a new value
+    long int addFlag(long int);     // Adds a flag to the client's flags
+    long int remFlag(long int);     // Removes a flag from the client's current flags
+
+
     char *name;                        // Player's Name
     int level;                 // Player's level (1-12)
     long int exp;               // Player's experience
@@ -28,20 +36,25 @@ public:
     int defense;                // Player's defensive strength
     int armor;                  // Number for the player's armor
     int weapon;                 // Number for the player's weapon
-    bool alive;                 // True/False: is the player alive?
-    bool started;               // True/False: has this player started? -Possibly deprecated
-    bool yourturn;             // True/False: is it your turn in battle?
     int forest_fights;          // Amount of forest fights left today
     int player_fights;          // Amount of player<->player fights for today
     char *password;            // Player's encrypted password
+    Pouch inventory;           // This contains their potions, etc.
+    long int lastcommand;      // timestamp for the last command typed
 
-    aClient *user;             // Pointer to the aClient this player is from
+    aClient *client;           // Pointer to the aClient this player is from
     Monster *fight;            // Pointer to the monster the player is currently fighting
     Monster *master;           // Pointer to the master the player is currently fighting
     aClient *battle;           // Pointer to the player this player is currently fighting
+
+private:
+    long int flags;            // Player's current flags
 };
 
 struct monster_ {
+    monster_();
+    monster_(monster_ *);
+    ~monster_();
     char *name;    // The monster's name
     char *weapon;  // A name for their weapon. Doesn't have to be in weapons[]
     int strength;  // Their strength