Several minor cleanups.

client/CPreGame.cpp

@@ -1981,7 +1981,7 @@ void OptionsTab::flagPressed( int color )
 			playerToRestore.reset();
 		}
 
-		int newPlayer = clickedNameID; //which player will take clicked position
+		int newPlayer; //which player will take clicked position
 
 		//who will be put here?
 		if(!clickedNameID) //AI player clicked -> if possible replace computer with unallocated player

lib/CArtHandler.h

@@ -127,7 +127,7 @@ public:
 	void deserializationFix();
 
 	friend class CArtifactInstance;
-	friend class AssembledArtifact;
+	friend struct AssembledArtifact;
 	template <typename Handler> void serialize(Handler &h, const int version)
 	{
 		h & static_cast<CArtifactInstance&>(*this);

lib/CCreatureHandler.cpp

@@ -605,7 +605,6 @@ void CCreatureHandler::loadCreatures()
 	ifs.open(DATA_DIR "/config/bonusnames.txt");
 	{
 		std::string buf2, buf3, line;
-		int i;
 		std::map<std::string,int>::const_iterator it;
 		getline(ifs, line); //skip 1st line
 		while(!ifs.eof())
@@ -1026,7 +1025,7 @@ void CCreatureHandler::loadMindImmunity(Bonus & b, BonusList & bl, std::string &
 
 	b.type = Bonus::SPELL_IMMUNITY;
 	b.val = Bonus::BASE_NUMBER;
-	si32 lastVal, curVal, lastLev = 0;
+	si32 curVal;
 
 	b.val = 0; //on-off ability, no value specified
 	loadToIt (curVal, src, it, 4); // 0 level is never active
@@ -1132,4 +1131,4 @@ void CCreatureHandler::buildBonusTreeForTiers()
 void CCreatureHandler::deserializationFix()
 {
 	buildBonusTreeForTiers();
-}
+}

lib/CGameState.h

@@ -308,7 +308,7 @@ struct DLL_EXPORT DuelParameters
 };
 
 
-class BattleInfo;
+struct BattleInfo;
 
 class DLL_EXPORT CGameState
 {
@@ -409,4 +409,4 @@ public:
 
 
 #endif // __CGAMESTATE_H__
- 
+ 

lib/CHeroHandler.cpp

@@ -392,7 +392,6 @@ void CHeroHandler::loadHeroes()
 		ballistics.push_back(bli);
 	}
 	{
-		it = 0;
 		std::ifstream inp;
 		dump.clear();
 		inp.open(DATA_DIR "/config/specials.txt"); //loading hero specials

lib/map.cpp

@@ -933,11 +933,9 @@ void Mapa::readRumors( const unsigned char * bufor, int &i)
 void Mapa::readHeader( const unsigned char * bufor, int &i)
 {
 	//reading allowed heroes (20 bytes)
-	int ist = i;
-
-	ist=i; //starting i for loop
-
+	int ist = i;				//starting i for loop
 	unsigned char disp = 0;
+
 	if(version>=SoD)
 	{
 		disp = bufor[i++];