diff options
| author | Bertram <bertram@cegetel.net> | 2010-03-03 23:38:18 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-03-03 23:38:18 +0100 |
| commit | 1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9 (patch) | |
| tree | 596305e9bfd4ad8448efd477a43f86490b1974c5 /src/npc.cpp | |
| parent | 8cc31b582f372238ce6bd2c86888d312cf1fe5b2 (diff) | |
| parent | f5f7a7d5990d1133f714b6cd431aecf6a332fbd5 (diff) | |
| download | mana-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.tar.gz mana-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.tar.bz2 mana-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.tar.xz mana-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Diffstat (limited to 'src/npc.cpp')
| -rw-r--r-- | src/npc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/npc.cpp b/src/npc.cpp index d104e840..38aecab8 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -86,7 +86,7 @@ void NPC::setSprite(unsigned int slot, int id, const std::string &color) // Do nothing } -const bool NPC::isTalking() +bool NPC::isTalking() { return NpcDialog::isActive() || BuyDialog::isActive() || SellDialog::isActive() || BuySellDialog::isActive() || |