From 73d718ba9e7d7ff8409b487fe25831dc63cfc64b Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Mon, 25 Jul 2016 05:39:29 +0000 Subject: [PATCH] [apathy][PATCH] Cast jboolean to bool --- .../serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp | 2 +- .../serverScript/src/shared/ScriptMethodsPlayerAccount.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp index 037b7ff5..c9d0cbfc 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp @@ -330,7 +330,7 @@ void JNICALL ScriptMethodsNewbieTutorialNamespace::newbieTutorialSendStartingLoc typedef std::pair Payload; typedef MessageQueueGenericValueType MessageType; - MessageType * const message = new MessageType (Payload (name, result)); + MessageType * const message = new MessageType (Payload (name, (bool)result)); sendMessageToPlayer (*player, message, CM_startingLocationSelectionResult); } diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp index 0234a47c..b7d49e7d 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp @@ -407,7 +407,7 @@ jboolean JNICALL ScriptMethodsPlayerAccountNamespace::setCompletedTutorial(JNIEn const unsigned int stationId = playerObject->getClient()->getStationId(); LOG("CustomerService", ("Setting tutorial bit to %s for stationId %i\n", (value) ? "true" : "false", stationId)); - GenericValueTypeMessage< std::pair > const updateTutorial("LoginToggleCompletedTutorial", std::pair(stationId, value)); + GenericValueTypeMessage< std::pair > const updateTutorial("LoginToggleCompletedTutorial", std::pair(stationId, (bool)value)); GameServer::getInstance().sendToCentralServer(updateTutorial); return true; }