Fix compile after merge

client/battle/CBattleInterface.cpp

@@ -188,7 +188,6 @@ CBattleInterface::CBattleInterface(const CCreatureSet *army1, const CCreatureSet
 	addUsedEvents(RCLICK | MOVE | KEYBOARD);
 	controlPanel->blockUI(true);
 	queue->update();
-	blockUI(true);
 }
 
 CBattleInterface::~CBattleInterface()

client/battle/CBattleInterfaceClasses.cpp

@@ -696,7 +696,7 @@ void CStackQueue::update()
 
 int32_t CStackQueue::getSiegeShooterIconID()
 {
-	return owner->siegeH->town->town->faction->index;
+	return owner->siegeController->getSiegedTown()->town->faction->index;
 }
 
 CStackQueue::StackBox::StackBox(CStackQueue * owner):

client/battle/CBattleSiegeController.cpp

@@ -350,3 +350,8 @@ void CBattleSiegeController::stackIsCatapulting(const CatapultAttack & ca)
 		wallPieceImages[wallId] = IImage::createFromFile(getWallPieceImageName(EWallVisual::EWallVisual(wallId), wallState));
 	}
 }
+
+const CGTownInstance *CBattleSiegeController::getSiegedTown() const
+{
+	return town;
+}

client/battle/CBattleSiegeController.h

@@ -106,5 +106,5 @@ public:
 	const CCreature *getTurretCreature() const;
 	Point getTurretCreaturePosition( BattleHex position ) const;
 
-
+	const CGTownInstance *getSiegedTown() const;
 };