diff options
Diffstat (limited to 'src/npc.cpp')
| -rw-r--r-- | src/npc.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/npc.cpp b/src/npc.cpp index 92ef4d82..7ba25c08 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -1,9 +1,8 @@ /* - * Aethyra + * The Mana World * Copyright (C) 2004 The Mana World Development Team * - * This file is part of Aethyra based on original code - * from The Mana World. + * This file is part of The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,8 +32,8 @@ #include "resources/npcdb.h" -bool NPC::mTalking = false; -Uint32 current_npc = 0; +bool NPC::isTalking = false; +int current_npc = 0; static const int NAME_X_OFFSET = 15; static const int NAME_Y_OFFSET = 30; @@ -108,10 +107,9 @@ Being::Type NPC::getType() const void NPC::talk() { - if (mTalking || !mNetwork) - return; + if (isTalking || !mNetwork) return; - mTalking = true; + isTalking = true; MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_NPC_TALK); outMsg.writeInt32(mId); |