X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/3662210ff8fbf469ecfc45ce9e1734ddb781e6fd..506edbcab050c851a820a2c4a371c5bf6a54f38d:/gameserv/player.h diff --git a/gameserv/player.h b/gameserv/player.h index c4d9bf7..92e95b4 100644 --- a/gameserv/player.h +++ b/gameserv/player.h @@ -2,7 +2,6 @@ #define PLAYER_H #include -#include #include "aClient.h" #include "pouch.h" @@ -12,7 +11,8 @@ class aClient; // forward declaration class Player { public: - Player(aClient *user = NULL); + Player(); + Player(aClient *); Player(char *); ~Player(); void setData(Player *); @@ -36,14 +36,13 @@ 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