From c0ed22c99e2de85ab0047dddfd3d4265441936f6 Mon Sep 17 00:00:00 2001 From: AlexVinS Date: Sun, 27 Nov 2016 22:14:41 +0300 Subject: [PATCH] Fixed CID 1366398. --- client/CPlayerInterface.cpp | 2 +- client/CPlayerInterface.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/CPlayerInterface.cpp b/client/CPlayerInterface.cpp index b69646422..ce58067e9 100644 --- a/client/CPlayerInterface.cpp +++ b/client/CPlayerInterface.cpp @@ -1133,7 +1133,7 @@ void CPlayerInterface::showOkDialog(std::vector & components, const M CInfoWindow::showOkDialog(str, &intComps, onOk, true, playerID); } -void CPlayerInterface::showBlockingDialog( const std::string &text, const std::vector &components, QueryID askID, int soundID, bool selection, bool cancel ) +void CPlayerInterface::showBlockingDialog( const std::string &text, const std::vector &components, QueryID askID, const int soundID, bool selection, bool cancel ) { EVENT_HANDLER_CALLED_BY_CLIENT; waitWhileDialog(); diff --git a/client/CPlayerInterface.h b/client/CPlayerInterface.h index 1407b1791..08d95c3dd 100644 --- a/client/CPlayerInterface.h +++ b/client/CPlayerInterface.h @@ -164,7 +164,7 @@ public: void showInfoDialog(const std::string &text, const std::vector &components, int soundID) override; void showRecruitmentDialog(const CGDwelling *dwelling, const CArmedInstance *dst, int level) override; void showShipyardDialog(const IShipyard *obj) override; //obj may be town or shipyard; - void showBlockingDialog(const std::string &text, const std::vector &components, QueryID askID, int soundID, bool selection, bool cancel) override; //Show a dialog, player must take decision. If selection then he has to choose between one of given components, if cancel he is allowed to not choose. After making choice, CCallback::selectionMade should be called with number of selected component (1 - n) or 0 for cancel (if allowed) and askID. + void showBlockingDialog(const std::string &text, const std::vector &components, QueryID askID, const int soundID, bool selection, bool cancel) override; //Show a dialog, player must take decision. If selection then he has to choose between one of given components, if cancel he is allowed to not choose. After making choice, CCallback::selectionMade should be called with number of selected component (1 - n) or 0 for cancel (if allowed) and askID. void showTeleportDialog(TeleportChannelID channel, TTeleportExitsList exits, bool impassable, QueryID askID) override; void showGarrisonDialog(const CArmedInstance *up, const CGHeroInstance *down, bool removableUnits, QueryID queryID) override; void showPuzzleMap() override;