Merge branch '1.0'

Conflicts:
	src/actorspritemanager.h
	src/beingmanager.cpp
	src/game.cpp
	src/gui/beingpopup.cpp
	src/gui/chat.cpp
	src/gui/chat.h
	src/gui/inventorywindow.h
	src/gui/itempopup.cpp
	src/gui/socialwindow.cpp
	src/gui/statuswindow.cpp
	src/gui/widgets/chattab.cpp
	src/gui/widgets/chattab.h
	src/net/tmwa/inventoryhandler.cpp
	src/net/tmwa/partyhandler.cpp
	src/party.cpp
	src/sound.cpp
	src/utils/stringutils.cpp
	src/utils/stringutils.h

1 files changed, 10 insertions, 2 deletions

diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h
index d9d5b534..d6aa609b 100644
--- a/src/actorspritemanager.h
+++ b/src/actorspritemanager.h
@@ -26,6 +26,8 @@
 #include "being.h"
 #include "flooritem.h"
 
+#include "gui/widgets/textfield.h"
+
 class LocalPlayer;
 class Map;
 
@@ -147,12 +149,18 @@ class ActorSpriteManager
          */
         void clear();
 
-        void getPlayerNames(std::vector<std::string> &names,
-                            bool npcNames);
+        AutoCompleteLister *getPlayerNameLister();
+
+        AutoCompleteLister *getPlayerNPCNameLister();
 
         void updatePlayerNames();
 
     protected:
+        friend class PlayerNamesLister;
+        friend class PlayerNPCNamesLister;
+
+        AutoCompleteLister *mPlayerNames;
+        AutoCompleteLister *mPlayerNPCNames;
         ActorSprites mActors;
         ActorSprites mDeleteActors;
         Map *mMap;