I've begun to add daily news and split up gameserv.cpp a bit

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

diff --git a/gameserv/player.h b/gameserv/player.h
index 9e8b2da7aed939b9dd39c058e56a6206f257d10f..92e95b4a66fb4be3212544e9df3c0b6f9bd85cc1 100644 (file)
--- a/gameserv/player.h
+++ b/gameserv/player.h
@@ -2,8 +2,8 @@
 #define PLAYER_H
 
 #include <string.h>
-#include <iostream.h>
 #include "aClient.h"
+#include "pouch.h"
 
 typedef struct monster_ Monster;
 
@@ -11,7 +11,8 @@ class aClient; // forward declaration
 
 class Player {
 public:
-    Player(aClient *user = NULL);
+    Player();
+    Player(aClient *);
     Player(char *);
     ~Player();
     void setData(Player *);
@@ -35,16 +36,17 @@ 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 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
 };