summaryrefslogtreecommitdiff
path: root/src/npc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/npc.cpp')
-rw-r--r--src/npc.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/npc.cpp b/src/npc.cpp
index 98c3e0eb..359546e2 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -40,14 +40,8 @@
bool NPC::isTalking = false;
int current_npc = 0;
-#ifdef TMWSERV_SUPPORT
NPC::NPC(int id, int job, Map *map):
Player(id, job, map)
-#else
-NPC::NPC(int id, int job, Map *map, Network *network):
- Player(id, job, map),
- mNetwork(network)
-#endif
{
NPCInfo info = NPCDB::get(job);
@@ -126,9 +120,6 @@ void NPC::talk()
#ifdef TMWSERV_SUPPORT
Net::GameServer::Player::talkToNPC(mId, true);
#else
- if (!mNetwork)
- return;
-
MessageOut outMsg(CMSG_NPC_TALK);
outMsg.writeInt32(mId);
outMsg.writeInt8(0);