summaryrefslogtreecommitdiff
path: root/src/npc.h
diff options
context:
space:
mode:
authorBertram <bertram@cegetel.net>2010-03-03 23:38:18 +0100
committerBertram <bertram@cegetel.net>2010-03-03 23:38:18 +0100
commit1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9 (patch)
tree596305e9bfd4ad8448efd477a43f86490b1974c5 /src/npc.h
parent8cc31b582f372238ce6bd2c86888d312cf1fe5b2 (diff)
parentf5f7a7d5990d1133f714b6cd431aecf6a332fbd5 (diff)
downloadmana-client-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.tar.gz
mana-client-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.tar.bz2
mana-client-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.tar.xz
mana-client-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.zip
Merge branch 'master' of gitorious.org:mana/mana
Diffstat (limited to 'src/npc.h')
-rw-r--r--src/npc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/npc.h b/src/npc.h
index e4207ea7..c7db58f1 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -55,7 +55,7 @@ class NPC : public Player
virtual int getNumberOfLayers() const
{ return 1; }
- static const bool isTalking();
+ static bool isTalking();
protected:
/**