summaryrefslogtreecommitdiff
path: root/src/npc.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-03-24 16:24:43 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-03-24 16:24:43 +0000
commitbfbb797e6c528e0650826e917d498c52362abbb0 (patch)
tree8d111b92eefe8451a66b57599217829b4127318e /src/npc.cpp
parentdae5c721bf974792db526f1d736384d95a75635e (diff)
downloadmana-bfbb797e6c528e0650826e917d498c52362abbb0.tar.gz
mana-bfbb797e6c528e0650826e917d498c52362abbb0.tar.bz2
mana-bfbb797e6c528e0650826e917d498c52362abbb0.tar.xz
mana-bfbb797e6c528e0650826e917d498c52362abbb0.zip
Merged 0.0 changes from revision 3177 to 3234 to trunk.
Diffstat (limited to 'src/npc.cpp')
-rw-r--r--src/npc.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/npc.cpp b/src/npc.cpp
index ccd085b6..2d291104 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -28,8 +28,6 @@
#include "gui/gui.h"
-class Spriteset;
-
NPC *current_npc = 0;
NPC::NPC(Uint16 id, Uint16 job, Map *map):