Updated CharData structure (defines.h).

Removed "Player" object & made a more general "Being" object which can be
used for Player, Pet, Monsters etc.

2 files changed, 31 insertions, 25 deletions

diff --git a/src/defines.h b/src/defines.h
index 72a0aff..8bd2e94 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -25,6 +25,7 @@
 #define _TMW_SERVER_DEFINES_
 
 #include <string>
+#include "object.h"
  
 // this file holds the global definitions and constants to be included
 // in multiple places throughout the server
@@ -42,19 +43,24 @@
 #define STATUS_BANNED     3 // denotes a temporarily banned account
 #define STATUS_RESTRICTED 4 // denotes a restricted access account
 
-      
+// Player Gender
+#define GENDER_MALE       0 // denotes male gender
+#define GENDER_FEMALE     1 // denotes female gender
+#define GENDER_UNKNOWN    2 // denotes unkown gender (possibly for some monsters?)
       
 // DATA STRUCTURES DEFINITIONS
 
 // persistent character data
 struct CharData
 {
-    std::string charName;         // character's name
-    //equipData charEquip;   // structure of equipped items
-    //estateData charEstate; // character's estate data
-    //petData charPet[3];    // character's pets
-    //itemData charItem;     // character's inventory
-    //graphicData charGraphic; // character's appearance
+    Being player;           // player information
+    //std::string charName;         // (depreciated :) now in player.name
+    //equipData charEquip;   // structure of equipped items (check Being)
+    //estateData charEstate; // character's estate data (check Being)
+    Being charPet[3];       // character's pets (using generic being object)
+    //petData charPet[3];    // character's pets (depreciated :)
+    //itemData charItem;     // character's inventory (check Being)
+    //graphicData charGraphic; // character's appearance (should be in Being)
 };
 
 // Account Data Structure
diff --git a/src/object.h b/src/object.h
index 55aa461..671a68f 100644
--- a/src/object.h
+++ b/src/object.h
@@ -21,10 +21,15 @@
  *  $Id$
  */
 
+
+#ifndef OBJECT_H
+#define OBJECT_H
+
 #include <iostream>
 
 /*
  * Generic In-Game Object Definition
+ * Base class for in-game objects
  */
 class Object
 {
@@ -37,19 +42,24 @@ class Object
 
 /*
  * Generic Being (Living Object)
+ * Used for Player & Monster (all animate objects)
  */
 class Being : public Object
 {
-    //Object name
+  public:
+    //Being name
     std::string name;
 
-    //Object level
+    //Being gender
+    unsigned int gender;
+
+    //Being level
     unsigned int level;
 
-    //Object money
+    //Being money
     unsigned int money;
 
-    //Object statistics
+    //Being statistics
     unsigned int strength;
     unsigned int agility;
     unsigned int vitality;
@@ -57,22 +67,12 @@ class Being : public Object
     unsigned int dexterity;
     unsigned int luck;
 
-    //Object inventory/equiped items
+    //Being inventory/equiped items
     //Inventory inventory;
     //Equipment equipment;
 
-  public:
-    virtual ~Being() { };
-    void update() { };
-};
-
-/*
- * Player object
- */
-class Player : public Being
-{
-    //Player gender (male = true, female = false)
-    bool gender;
-  public:
+    ~Being() { } //empty definition
+    void update() { } //empty definition
 };
 
+#endif