updated the Change log w/ new additions

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

diff --git a/gameserv/player.h b/gameserv/player.h
index 5fddae586f9203e23921576d4bdbaea34e01cd51..6c2a8a8035c76c44de82e7b8d26406e4fdf0f031 100644 (file)
--- a/gameserv/player.h
+++ b/gameserv/player.h
@@ -5,9 +5,8 @@
 
 using namespace std;
 
-typedef struct monster_ Monster;
-
 class aClient; // forward declaration
+class Monster; // forward declaration
 
 class item;    // forward declaration
 class weapon;  // forward declaration
@@ -57,7 +56,7 @@ public:
   void setRawPassword(const char *p); //Set the player's password without encrypting it
   
   void setClient(aClient *); // Set the pointer back to this player's IRC Client
-  void setMonster(Monster); // Set the pointer to the monster this player is fighting
+  void setMonster(Monster *); // Set the pointer to the monster this player is fighting
   void setMyMaster(Monster *); // Set the pointer to the master this player is fighting
   void setBattle(aClient *); // Set the pointer to the player this person is fighting
 
@@ -135,11 +134,13 @@ private:
   item *a;                    // Player's armor
 };
 
-struct monster_ {
-  monster_();
-  monster_(monster_ *);
-  monster_(monster_ &);
-  ~monster_();
+class Monster {
+public:
+  Monster();
+  Monster(Monster *);
+  Monster(const Monster &);
+  Monster(Monster &);
+  ~Monster();
   string name;         // The monster's name
   string weapon;       // A name for their weapon. Doesn't have to be in weapons[]
   int strength;        // Their strength