mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 14:57:44 +00:00
Code Activity

fix wrong placename when buying plot and some logmessage cleanup

Browse source
This commit is contained in:
NotAdam 2018-12-02 21:08:38 +11:00
parent d49eab1c1c
commit d66d1e8d55
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/servers/Scripts/common/housing/CmnDefHousingSignboard.cpp
View file

@ -5,6 +5,7 @@
#include <Manager/HousingMgr.h> #include <Manager/HousingMgr.h>
#include <Network/PacketWrappers/ActorControlPacket143.h> #include <Network/PacketWrappers/ActorControlPacket143.h>
#include <Network/CommonActorControl.h> #include <Network/CommonActorControl.h>
#include <Exd/ExdDataGenerated.h>
#include "Framework.h" #include "Framework.h"
@ -47,37 +48,32 @@ public:
{ {
auto screenMsgPkt = makeActorControl143( player.getId(), ActorControl::DutyQuestScreenMsg, m_id, 0x98 ); auto screenMsgPkt = makeActorControl143( player.getId(), ActorControl::DutyQuestScreenMsg, m_id, 0x98 );
player.queuePacket( screenMsgPkt ); player.queuePacket( screenMsgPkt );
auto screenMsgPkt2 = makeActorControl143( player.getId(), ActorControl::LogMsg, 0x0D16, 0x1AA,
activeLand.ward + 1, activeLand.plot + 1 ); player.sendLogMessage( 0x0D16, pTerritory->getTerritoryTypeInfo()->placeName, activeLand.ward + 1, activeLand.plot + 1 );
player.queuePacket( screenMsgPkt2 );
break; break;
} }
case LandPurchaseResult::ERR_NOT_ENOUGH_GIL: case LandPurchaseResult::ERR_NOT_ENOUGH_GIL:
{ {
auto errorMsg = makeActorControl143( player.getId(), ActorControl::LogMsg, 3314 ); player.sendLogMessage( 3314 );
player.queuePacket( errorMsg );
break; break;
} }
case LandPurchaseResult::ERR_NOT_AVAILABLE: case LandPurchaseResult::ERR_NOT_AVAILABLE:
{ {
auto errorMsg = makeActorControl143( player.getId(), ActorControl::LogMsg, 3312 ); player.sendLogMessage( 3312 );
player.queuePacket( errorMsg );
break; break;
} }
case LandPurchaseResult::ERR_NO_MORE_LANDS_FOR_CHAR: case LandPurchaseResult::ERR_NO_MORE_LANDS_FOR_CHAR:
{ {
auto errorMsg = makeActorControl143( player.getId(), ActorControl::LogMsg, 3313 ); player.sendLogMessage( 3313 );
player.queuePacket( errorMsg );
break; break;
} }
case LandPurchaseResult::ERR_INTERNAL: case LandPurchaseResult::ERR_INTERNAL:
{ {
auto errorMsg = makeActorControl143( player.getId(), ActorControl::LogMsg, 1995 ); player.sendLogMessage( 1995 );
player.queuePacket( errorMsg );
break; break;
} }
} }

5
src/servers/sapphire_zone/Territory/Zone.cpp
View file

@ -756,3 +756,8 @@ Sapphire::Entity::EventObjectPtr Sapphire::Zone::registerEObj( const std::string
return eObj; return eObj;
} }
Sapphire::Data::TerritoryTypePtr Sapphire::Zone::getTerritoryTypeInfo() const
{
return m_territoryTypeInfo;
}

2
src/servers/sapphire_zone/Territory/Zone.h
View file

@ -76,6 +76,8 @@ namespace Sapphire
void setCurrentFestival( uint16_t festivalId, uint16_t additionalFestivalId = 0 ); void setCurrentFestival( uint16_t festivalId, uint16_t additionalFestivalId = 0 );
std::shared_ptr< Data::TerritoryType > getTerritoryTypeInfo() const;
virtual bool init(); virtual bool init();
virtual void loadCellCache(); virtual void loadCellCache();