summaryrefslogtreecommitdiff
path: root/src/npc.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/npc.h')
-rw-r--r--src/npc.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/npc.h b/src/npc.h
index e1bf9737..216fb2fe 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -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
@@ -44,10 +43,9 @@ class NPC : public Player
virtual Type getType() const;
- void talk();;
-
- static bool mTalking;
+ void talk();
+ static bool isTalking;
protected:
Network *mNetwork;
void updateCoords();
@@ -55,6 +53,6 @@ class NPC : public Player
Text *mName;
};
-extern Uint32 current_npc;
+extern int current_npc;
#endif