Fixed a bunch of compilation warnings about deprecated const char *

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

diff --git a/gameserv/aClient.h b/gameserv/aClient.h
index 2ffee812b6b584e4799926f4011324e23ed21e87..4a595805e8a4f28813431e1631c8bc92067dd3ad 100644 (file)
--- a/gameserv/aClient.h
+++ b/gameserv/aClient.h
@@ -2,44 +2,56 @@
 #define ACLIENT_H
 
 #include <string.h>
+#include "options.h"
 #include "player.h"
 #include <iostream>
-using std::ostream;
 
 class Player; // forward declaration
 
-class aClient {
-
-       friend ostream &operator<<( ostream &output, const aClient &c);
-
-    public:
-        aClient(char *);               // Constructor takes a char for the nick
-       aClient(const aClient &);       // Copy constructor
-        aClient();                     // Default constructor
-        ~aClient();                    // Destructor
-
-       // Sets the client's player struct data to the same thing as another aClient's 
-       // player struct data
-       void setData(const aClient *);
-
-        void setNick(char *n) { strcpy(nick, n);};     // Sets the client's nick
-        char *getNick() { return nick; };              // Returns the client's nick
-       Player *stats;                                  // Pointer to the client's player struct
-
-       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
-
-    private:
-       #ifdef P10
-           char realnick[32];  // Real Nickname
-       #endif
+class aClient
+{
+  friend ostream &operator<<( ostream &output, const aClient &c);
+  
+public:
+  aClient(const string &);             // Constructor takes a char for the nick
+  
+#ifdef P10
+  aClient(char *, char *);     // Constructor takes a char for the nick and realnick
+#endif
 
-        char nick[32];         // Client's current nickname. Numeric if P10 is used
-       long int flags;         // Client's current flags.
+  bool operator==(const aClient &);
+  bool operator!=(const aClient &);
+  aClient(const aClient &);    // Copy constructor
+  aClient();                   // Default constructor
+  ~aClient();                  // Destructor
+  
+  // Sets the client's player struct data to the same thing as another aClient's 
+  // player struct data
+  void setData(const aClient *);
+  
+  void setNick(char *n) { strcpy(nick, n);};   // Sets the client's nick
+  char *getNick() { return nick; };            // Returns the client's nick
+  
+#ifdef P10
+  void setRealNick(char *rn) { strcpy(realnick, rn);}; // Sets the client's realnick
+  char *getRealNick() { return realnick; };    // Returns the client's real text nickname
+#endif
+  
+  Player *stats;                                       // Pointer to the client's player struct
+  
+  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
+  
+private:
+#ifdef P10
+  char realnick[32];   // Client's text nickname. Not the numeric
+#endif
+  char nick[32];               // Client's current nickname. Numeric if P10 is used
+  long int flags;              // Client's current flags.
 };
 
 #endif