From 408e9b42399926b58abfa3dff524ccc9370f2518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Bj=C3=B6rkholm?= Date: Thu, 16 Nov 2017 14:50:12 +0100 Subject: [PATCH] Fix data type for Modal Dialog ID --- src/client/game.cpp | 2 +- src/client/game.h | 2 +- src/client/protocolgame.h | 2 +- src/client/protocolgamesend.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client/game.cpp b/src/client/game.cpp index 86e59c67..683157d4 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -1383,7 +1383,7 @@ void Game::requestItemInfo(const ItemPtr& item, int index) m_protocolGame->sendRequestItemInfo(item->getId(), item->getSubType(), index); } -void Game::answerModalDialog(int dialog, int button, int choice) +void Game::answerModalDialog(uint32 dialog, int button, int choice) { if(!canPerformGameAction()) return; diff --git a/src/client/game.h b/src/client/game.h index 53b8314f..7011421d 100644 --- a/src/client/game.h +++ b/src/client/game.h @@ -282,7 +282,7 @@ public: void requestItemInfo(const ItemPtr& item, int index); // >= 970 modal dialog - void answerModalDialog(int dialog, int button, int choice); + void answerModalDialog(uint32 dialog, int button, int choice); // >= 984 browse field void browseField(const Position& position); diff --git a/src/client/protocolgame.h b/src/client/protocolgame.h index ada5cf4c..fdfaf6ae 100644 --- a/src/client/protocolgame.h +++ b/src/client/protocolgame.h @@ -110,7 +110,7 @@ public: void sendRequestQuestLine(int questId); void sendNewNewRuleViolation(int reason, int action, const std::string& characterName, const std::string& comment, const std::string& translation); void sendRequestItemInfo(int itemId, int subType, int index); - void sendAnswerModalDialog(int dialog, int button, int choice); + void sendAnswerModalDialog(uint32 dialog, int button, int choice); void sendBrowseField(const Position& position); void sendSeekInContainer(int cid, int index); void sendBuyStoreOffer(int offerId, int productType, const std::string& name); diff --git a/src/client/protocolgamesend.cpp b/src/client/protocolgamesend.cpp index 176b69ac..3644f43c 100644 --- a/src/client/protocolgamesend.cpp +++ b/src/client/protocolgamesend.cpp @@ -830,7 +830,7 @@ void ProtocolGame::sendRequestItemInfo(int itemId, int subType, int index) send(msg); } -void ProtocolGame::sendAnswerModalDialog(int dialog, int button, int choice) +void ProtocolGame::sendAnswerModalDialog(uint32 dialog, int button, int choice) { OutputMessagePtr msg(new OutputMessage); msg->addU8(Proto::ClientAnswerModalDialog);