diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-26 21:29:49 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-26 21:29:49 +0100 |
| commit | 3008805eea4b972265597ba196ab05ce64c69965 (patch) | |
| tree | d3195600e956e496b6b21f200fc04e5b08cab368 /src/npc.cpp | |
| parent | 3ad6ac47d4967870a54fddd66aa9996724115b94 (diff) | |
| parent | 6b0cff837b7adae56dc90d12e9c0e256e6aab134 (diff) | |
| download | mana-3008805eea4b972265597ba196ab05ce64c69965.tar.gz mana-3008805eea4b972265597ba196ab05ce64c69965.tar.bz2 mana-3008805eea4b972265597ba196ab05ce64c69965.tar.xz mana-3008805eea4b972265597ba196ab05ce64c69965.zip | |
Merge branch 'aethyra/master'
Conflicts:
data/graphics/images/login_wallpaper.png
src/being.cpp
src/beingmanager.cpp
src/engine.cpp
src/game.cpp
src/gui/buysell.cpp
src/gui/buysell.h
src/gui/gui.h
src/gui/npc_text.cpp
src/gui/npc_text.h
src/gui/npcintegerdialog.cpp
src/gui/npclistdialog.cpp
src/gui/npclistdialog.h
src/gui/npcstringdialog.cpp
src/gui/sell.cpp
src/gui/shop.cpp
src/gui/table.cpp
src/net/beinghandler.cpp
src/net/npchandler.cpp
src/net/playerhandler.cpp
src/npc.cpp
src/npc.h
src/shopitem.cpp
src/shopitem.h
src/utils/stringutils.cpp
src/utils/stringutils.h
src/utils/trim.h
Diffstat (limited to 'src/npc.cpp')
| -rw-r--r-- | src/npc.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/npc.cpp b/src/npc.cpp index 5132e0dc..7ba25c08 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -32,10 +32,8 @@ #include "resources/npcdb.h" -extern NpcTextDialog *npcTextDialog; - -int 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; @@ -51,7 +49,8 @@ NPC::NPC(Uint32 id, Uint16 job, Map *map, Network *network): i != info.sprites.end(); i++) { - if (c == VECTOREND_SPRITE) break; + if (c == VECTOREND_SPRITE) + break; std::string file = "graphics/sprites/" + (*i)->sprite; int variant = (*i)->variant; @@ -108,7 +107,7 @@ Being::Type NPC::getType() const void NPC::talk() { - if (isTalking || !this || !mNetwork) return; + if (isTalking || !mNetwork) return; isTalking = true; MessageOut outMsg(mNetwork); @@ -120,7 +119,5 @@ void NPC::talk() void NPC::updateCoords() { if (mName) - { mName->adviseXY(mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET); - } } |