summaryrefslogtreecommitdiff
path: root/src/being.h
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2005-09-13 22:56:29 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2005-09-13 22:56:29 +0000
commit3dc311a652d1fda1252903a974920395e56e5668 (patch)
tree7098d55015d28a4d973c5073d7c9e45ae03ec400 /src/being.h
parent78771718bf7af14273d7bb0090dccff97b00b397 (diff)
downloadmana-3dc311a652d1fda1252903a974920395e56e5668.tar.gz
mana-3dc311a652d1fda1252903a974920395e56e5668.tar.bz2
mana-3dc311a652d1fda1252903a974920395e56e5668.tar.xz
mana-3dc311a652d1fda1252903a974920395e56e5668.zip
Merged with SDL_NET_TEST branch.
Diffstat (limited to 'src/being.h')
-rw-r--r--src/being.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/being.h b/src/being.h
index 2a9a8421..98aaeb80 100644
--- a/src/being.h
+++ b/src/being.h
@@ -87,7 +87,6 @@ class Being
unsigned char emotion_time; /**< Time until emotion disappears */
unsigned int text_x, text_y; // temp solution to fix speech position
- char name[24]; /**< Name of character */
unsigned short aspd; /**< Attack speed */
/**
@@ -129,11 +128,18 @@ class Being
void setDamage(const std::string &text, int time);
/**
- * Sets the name for the being
+ * Returns the name of the being.
+ */
+ const std::string&
+ getName() { return mName; }
+
+ /**
+ * Sets the name for the being.
*
* @param text The name that should appear.
*/
- void setName(char *name);
+ void
+ setName(const std::string &name) { mName = name; }
/**
* Sets the hair color for this being.
@@ -225,6 +231,7 @@ class Being
unsigned int speech_time;
unsigned int damage_time;
bool showSpeech, showDamage;
+ std::string mName; /**< Name of character */
/**
* Sets the new path for this being.