Fixed avatars in network (non-public) games.

src/session.cpp

@@ -42,7 +42,6 @@ Session::Session(GuiInterface *g, ConfigFile *c)
 : currentGameID(0), myNetClient(NULL), myNetServer(NULL), myIrcThread(NULL),
   myGui(g), myConfig(c), myGameType(GAME_TYPE_NONE)
 {
-	myAvatarManager.reset(new AvatarManager);
 }
 
 
@@ -56,9 +55,15 @@ Session::~Session()
 
 bool Session::init()
 {
+	myAvatarManager.reset(new AvatarManager);
 	return myAvatarManager->Init(myConfig->readConfigString("AppDataDir"), myConfig->readConfigString("CacheDir"));
 }
 
+void Session::init(boost::shared_ptr<AvatarManager> manager)
+{
+	myAvatarManager = manager;
+}
+
 void Session::startLocalGame(const GameData &gameData, const StartData &startData) {
 
 	myGameType = GAME_TYPE_LOCAL;
@@ -117,11 +122,16 @@ GuiInterface *Session::getGui()
 	return myGui;
 }
 
-Session::GameType Session::GetGameType()
+Session::GameType Session::getGameType()
 {
 	return myGameType;
 }
 
+boost::shared_ptr<AvatarManager> Session::getAvatarManager()
+{
+	return myAvatarManager;
+}
+
 void Session::startInternetClient()
 {
 	if (myNetClient || myIrcThread || !myGui)