Merge pull request #904 from ninjalulz/FixModalWindowId

Fix data type for Modal Dialog ID
This commit is contained in:
Eduardo Bart 2017-11-16 22:56:28 -02:00 committed by GitHub
commit a9c59526e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View File

@ -1383,7 +1383,7 @@ void Game::requestItemInfo(const ItemPtr& item, int index)
m_protocolGame->sendRequestItemInfo(item->getId(), item->getSubType(), 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()) if(!canPerformGameAction())
return; return;

View File

@ -282,7 +282,7 @@ public:
void requestItemInfo(const ItemPtr& item, int index); void requestItemInfo(const ItemPtr& item, int index);
// >= 970 modal dialog // >= 970 modal dialog
void answerModalDialog(int dialog, int button, int choice); void answerModalDialog(uint32 dialog, int button, int choice);
// >= 984 browse field // >= 984 browse field
void browseField(const Position& position); void browseField(const Position& position);

View File

@ -110,7 +110,7 @@ public:
void sendRequestQuestLine(int questId); void sendRequestQuestLine(int questId);
void sendNewNewRuleViolation(int reason, int action, const std::string& characterName, const std::string& comment, const std::string& translation); 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 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 sendBrowseField(const Position& position);
void sendSeekInContainer(int cid, int index); void sendSeekInContainer(int cid, int index);
void sendBuyStoreOffer(int offerId, int productType, const std::string& name); void sendBuyStoreOffer(int offerId, int productType, const std::string& name);

View File

@ -830,7 +830,7 @@ void ProtocolGame::sendRequestItemInfo(int itemId, int subType, int index)
send(msg); send(msg);
} }
void ProtocolGame::sendAnswerModalDialog(int dialog, int button, int choice) void ProtocolGame::sendAnswerModalDialog(uint32 dialog, int button, int choice)
{ {
OutputMessagePtr msg(new OutputMessage); OutputMessagePtr msg(new OutputMessage);
msg->addU8(Proto::ClientAnswerModalDialog); msg->addU8(Proto::ClientAnswerModalDialog);