From 60f10c242fc4f99b0ab0f8d8c6d4b4acde0022cd Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Fri, 27 Mar 2009 21:13:02 +0100 Subject: Clean up of most of the Network pointers Now that messages can be sent without requiring a pointer to the Network instance, a lot of cleanup was possible. --- src/npc.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/npc.h') diff --git a/src/npc.h b/src/npc.h index c2cab6f0..57e6d5a8 100644 --- a/src/npc.h +++ b/src/npc.h @@ -24,20 +24,13 @@ #include "player.h" -#ifdef EATHENA_SUPPORT -class Network; -#endif class Graphics; class Text; class NPC : public Player { public: -#ifdef TMWSERV_SUPPORT - NPC(int id, int sprite, Map *map); -#else - NPC(int id, int job, Map *map, Network *network); -#endif + NPC(int id, int job, Map *map); ~NPC(); @@ -56,6 +49,7 @@ class NPC : public Player { return 0x83; } // blocked like a monster by walls, monsters and characters ( bin 1000 0011) static bool isTalking; + protected: /** * Gets the way a monster blocks pathfinding for other objects @@ -63,10 +57,8 @@ class NPC : public Player virtual Map::BlockType getBlockType() const { return Map::BLOCKTYPE_CHARACTER; } //blocks like a player character -#ifdef EATHENA_SUPPORT - Network *mNetwork; -#endif void updateCoords(); + private: Text *mName; }; -- cgit v1.2.3-70-g09d2