Added a logout command and fixed some of the do_fight code

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

diff --git a/gameserv/player.h b/gameserv/player.h
index 49e6ccf84948988c6543a6a65ad18d5df1f43e9d..3ea5fa1b165fa8fa449f186dde26bab31e9e4f90 100644 (file)
--- a/gameserv/player.h
+++ b/gameserv/player.h
@@ -2,10 +2,10 @@
 #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
 
@@ -15,8 +15,15 @@ public:
     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
+
 
-    const Player &operator=(const Player &);
     char *name;                        // Player's Name
     int level;                 // Player's level (1-12)
     long int exp;               // Player's experience
@@ -28,18 +35,24 @@ 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 obsolete
-    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.
+
     aClient *user;             // 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