Fix NPC handling to not need a handle on the NPC

Loosely based on TMW commit f04a8713ffc83db8b3dc4a472b28aad25a2b2bd1

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 4 insertions, 9 deletions

diff --git a/src/npc.h b/src/npc.h
index 0dc9c742..e1bf9737 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -23,6 +23,8 @@
 #ifndef NPC_H
 #define NPC_H
 
+#include <SDL_types.h>
+
 #include "player.h"
 
 class Network;
@@ -42,14 +44,7 @@ class NPC : public Player
 
         virtual Type getType() const;
 
-        void talk();
-        void nextDialog();
-        void dialogChoice(char choice);
-        void integerInput(int value);
-        void stringInput(const std::string &value);
-
-        void buy();
-        void sell();
+        void talk();;
 
         static bool mTalking;
 
@@ -60,6 +55,6 @@ class NPC : public Player
         Text *mName;
 };
 
-extern NPC *current_npc;
+extern Uint32 current_npc;
 
 #endif