- missed file from previous commit

- minor fixes

client/CPlayerInterface.cpp

@@ -2200,7 +2200,7 @@ void CPlayerInterface::artifactRemoved(const ArtifactLocation &al)
 	{
 		if(isa->type & IShowActivable::WITH_ARTIFACTS)
 		{
-			(dynamic_cast<CWindowWithArtifacts*>(isa))->artifactRemoved(al);
+			(dynamic_cast<CArtifactHolder*>(isa))->artifactRemoved(al);
 		}
 	}
 }
@@ -2212,7 +2212,7 @@ void CPlayerInterface::artifactMoved(const ArtifactLocation &src, const Artifact
 	{
 		if(isa->type & IShowActivable::WITH_ARTIFACTS)
 		{
-			(dynamic_cast<CWindowWithArtifacts*>(isa))->artifactMoved(src, dst);
+			(dynamic_cast<CArtifactHolder*>(isa))->artifactMoved(src, dst);
 		}
 	}
 }
@@ -2224,7 +2224,7 @@ void CPlayerInterface::artifactAssembled(const ArtifactLocation &al)
 	{
 		if(isa->type & IShowActivable::WITH_ARTIFACTS)
 		{
-			(dynamic_cast<CWindowWithArtifacts*>(isa))->artifactAssembled(al);
+			(dynamic_cast<CArtifactHolder*>(isa))->artifactAssembled(al);
 		}
 	}
 }
@@ -2236,7 +2236,7 @@ void CPlayerInterface::artifactDisassembled(const ArtifactLocation &al)
 	{
 		if(isa->type & IShowActivable::WITH_ARTIFACTS)
 		{
-			(dynamic_cast<CWindowWithArtifacts*>(isa))->artifactAssembled(al);
+			(dynamic_cast<CArtifactHolder*>(isa))->artifactDisassembled(al);
 		}
 	}
 }

client/Client.cpp

@@ -432,7 +432,7 @@ void CClient::newGame( CConnection *con, StartInfo *si )
 	hotSeat = (humanPlayers > 1);
 
 	std::vector<FileInfo> scriptModules;
-	CFileUtility::getFilesWithExt(scriptModules, "./Scripting", ".dll");
+	CFileUtility::getFilesWithExt(scriptModules, LIB_DIR "/Scripting", "." LIB_EXT);
 	BOOST_FOREACH(FileInfo &m, scriptModules)
 	{
 		CScriptingModule * nm = CDynLibHandler::getNewScriptingModule(m.name);

lib/IGameCallback.cpp

@@ -1101,7 +1101,7 @@ int CPlayerSpecificInfoCallback::howManyHeroes(bool includeGarrisoned) const
 
 const CGHeroInstance* CPlayerSpecificInfoCallback::getHeroBySerial(int serialId) const
 {
-	const PlayerState *p = getPlayer(serialId);
+	const PlayerState *p = getPlayer(player);
 	ERROR_RET_VAL_IF(!p, "No player info", NULL);
 	ERROR_RET_VAL_IF(serialId < 0 || serialId >= p->heroes.size(), "No player info", NULL);
 	return p->heroes[serialId];
@@ -1109,7 +1109,7 @@ const CGHeroInstance* CPlayerSpecificInfoCallback::getHeroBySerial(int serialId)
 
 const CGTownInstance* CPlayerSpecificInfoCallback::getTownBySerial(int serialId) const
 {
-	const PlayerState *p = getPlayer(serialId);
+	const PlayerState *p = getPlayer(player);
 	ERROR_RET_VAL_IF(!p, "No player info", NULL);
 	ERROR_RET_VAL_IF(serialId < 0 || serialId >= p->towns.size(), "No player info", NULL);
 	return p->towns[serialId];

lib/map.cpp

@@ -1057,7 +1057,7 @@ void Mapa::readPredefinedHeroes( const unsigned char * bufor, int &i)
 
 				if(readChar(bufor,i))//customBio
 					cgh->biography = readString(bufor,i);
-				int sex = bufor[i++]; // 0xFF is default, 00 male, 01 female    //FIXME:unused?
+				cgh->sex = bufor[i++]; // 0xFF is default, 00 male, 01 female
 				if(readChar(bufor,i))//are spells
 				{
 					int ist = i;
@@ -1755,7 +1755,7 @@ void Mapa::readObjects( const unsigned char * bufor, int &i)
 				nobj = hp;
 
 				int a = bufor[i++]; //unkown byte, seems to be always 0 (if not - scream!)
-				tlog2 << "Unhandled Hero Placeholder detected\n";
+				tlog2 << "Unhandled Hero Placeholder detected: "<<a<<"\n";
 
 				int htid = bufor[i++]; //hero type id
 				nobj->subID = htid;