summaryrefslogtreecommitdiff
path: root/src/object.h
diff options
context:
space:
mode:
authorAaron Marks <nymacro@gmail.com>2005-04-27 12:14:17 +0000
committerAaron Marks <nymacro@gmail.com>2005-04-27 12:14:17 +0000
commitc6079c8fb0f540bfd28e3afc02d80a9a83de3d02 (patch)
tree2cda5ac1203ab1b8eceeecd6aaf1fcdf45a01276 /src/object.h
parent1ee02ff239755d4cd9bfbbf298886987096e1cae (diff)
downloadmanaserv-c6079c8fb0f540bfd28e3afc02d80a9a83de3d02.tar.gz
manaserv-c6079c8fb0f540bfd28e3afc02d80a9a83de3d02.tar.bz2
manaserv-c6079c8fb0f540bfd28e3afc02d80a9a83de3d02.tar.xz
manaserv-c6079c8fb0f540bfd28e3afc02d80a9a83de3d02.zip
Made scripting defines slightly cleaner.
Changed LivingObject to Being (as that is standard TMW name for it).
Diffstat (limited to 'src/object.h')
-rw-r--r--src/object.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/object.h b/src/object.h
index 1135ef9a..55aa4613 100644
--- a/src/object.h
+++ b/src/object.h
@@ -36,9 +36,9 @@ class Object
};
/*
- * Generic Living Object
+ * Generic Being (Living Object)
*/
-class LivingObject : public Object
+class Being : public Object
{
//Object name
std::string name;
@@ -62,16 +62,17 @@ class LivingObject : public Object
//Equipment equipment;
public:
- ~LivingObject() { };
+ virtual ~Being() { };
void update() { };
};
/*
* Player object
*/
-class Player : public LivingObject
+class Player : public Being
{
//Player gender (male = true, female = false)
bool gender;
public:
};
+