From ec6aa1d4d6571b158f2c19c1aa03013dca6ecabe Mon Sep 17 00:00:00 2001 From: Mordred Date: Sun, 11 Nov 2018 12:10:57 +0100 Subject: [PATCH] Some additions --- .../Scripts/common/CmnDefHousingSignboard.cpp | 21 ++++++++++++------- src/servers/sapphire_zone/ServerZone.cpp | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/servers/Scripts/common/CmnDefHousingSignboard.cpp b/src/servers/Scripts/common/CmnDefHousingSignboard.cpp index 04928389..083ad183 100644 --- a/src/servers/Scripts/common/CmnDefHousingSignboard.cpp +++ b/src/servers/Scripts/common/CmnDefHousingSignboard.cpp @@ -7,6 +7,9 @@ using namespace Core; +using namespace Network; +using namespace Packets; +using namespace Server; class CmnDefHousingSignboard : public EventScript { @@ -31,23 +34,27 @@ public: PurchaseResult res = pHousing->purchseLand( player, activeLand.plot, static_cast< uint8_t >( result.param2 ) ); - switch( res ) { case PurchaseResult::SUCCESS: { - auto screenMsgPkt = Network::Packets::Server::makeActorControl143( player.getId(), - Network::ActorControl::DutyQuestScreenMsg, - m_id, 0x98 ); + auto screenMsgPkt = makeActorControl143( player.getId(), ActorControl::DutyQuestScreenMsg, m_id, 0x98 ); player.queuePacket( screenMsgPkt ); + break; } + case PurchaseResult::ERR_NOT_ENOUGH_GIL: { - auto errorMsg = Network::Packets::Server::makeActorControl143( player.getId(), - Network::ActorControl::LogMsg, - 4027 ); + auto errorMsg = makeActorControl143( player.getId(), ActorControl::LogMsg, 4027 ); player.queuePacket( errorMsg ); + break; } + + case PurchaseResult::ERR_NOT_AVAILABLE: + break; + + case PurchaseResult::ERR_INTERNAL: + break; } } diff --git a/src/servers/sapphire_zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp index d60de3f3..e7615dc2 100644 --- a/src/servers/sapphire_zone/ServerZone.cpp +++ b/src/servers/sapphire_zone/ServerZone.cpp @@ -213,7 +213,7 @@ void Core::ServerZone::mainLoop() auto currTime = Util::getTimeSeconds(); - pTeriMgr->updateTerritoryInstances( currTime ); + pTeriMgr->updateTerritoryInstances( static_cast< uint32_t >( currTime ) ); pScriptMgr->update();