From 3e28b58c80968a549c6ee401c4b102d2c1941b29 Mon Sep 17 00:00:00 2001
From: nordsoft <nordsoft@rambler.ru>
Date: Thu, 6 Apr 2023 19:59:22 +0400
Subject: [PATCH] Fixes

---
 client/NetPacksClient.cpp |  2 +-
 server/CQuery.cpp         | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/client/NetPacksClient.cpp b/client/NetPacksClient.cpp
index 1485b6d3b..d376d24bf 100644
--- a/client/NetPacksClient.cpp
+++ b/client/NetPacksClient.cpp
@@ -735,7 +735,7 @@ void ApplyFirstClientNetPackVisitor::visitBattleUpdateGateState(BattleUpdateGate
 
 void ApplyFirstClientNetPackVisitor::visitBattleResult(BattleResult & pack)
 {
-	callBattleInterfaceIfPresentForBothSides(cl, &IBattleEventsReceiver::battleEnd, &pack, queryID);
+	callBattleInterfaceIfPresentForBothSides(cl, &IBattleEventsReceiver::battleEnd, &pack, pack.queryID);
 	cl.battleFinished();
 }
 
diff --git a/server/CQuery.cpp b/server/CQuery.cpp
index f0b97879c..de1fb8721 100644
--- a/server/CQuery.cpp
+++ b/server/CQuery.cpp
@@ -409,28 +409,6 @@ void CBattleDialogQuery::onRemoval(PlayerColor color)
 	}
 }
 
-CBattleDialogQuery::CBattleDialogQuery(CGameHandler * owner, const BattleInfo * Bi):
-	CDialogQuery(owner)
-{
-	bi = Bi;
-
-	for(auto & side : bi->sides)
-		addPlayer(side.color);
-}
-
-void CBattleDialogQuery::onRemoval(PlayerColor color)
-{
-	assert(answer);
-	if(*answer == 1)
-	{
-		gh->startBattlePrimary(bi->sides[0].armyObject, bi->sides[1].armyObject, bi->tile, bi->sides[0].hero, bi->sides[1].hero, bi->creatureBank, bi->town);
-	}
-	else
-	{
-		gh->endBattleConfirm(bi);
-	}
-}
-
 void CBlockingDialogQuery::notifyObjectAboutRemoval(const CObjectVisitQuery & objectVisit) const
 {
 	assert(answer);