1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-06-04 23:27:45 +00:00

Refactor managers and move them into Sapphire::World::Managers namespace

This commit is contained in:
NotAdam 2018-12-01 00:27:16 +11:00
parent 08ea6909ab
commit 68195b17a1
317 changed files with 442 additions and 400 deletions

View file

@ -49,7 +49,7 @@ foreach(_scriptDir ${children})
LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${SCRIPT_LIB_DIR}"
)
endif()
target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/servers/sapphire_zone/")
target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/servers/sapphire_Territory/")
target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/servers/Script/Scripts")
target_include_directories("script_${_name}" PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
target_include_directories("script_${_name}" PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Scripts")

View file

@ -1,8 +1,8 @@
#include <ScriptObject.h>
#include <Actor/Player.h>
#include <Zone/Zone.h>
#include <Zone/HousingZone.h>
#include <Zone/HousingMgr.h>
#include <Territory/Zone.h>
#include <Territory/HousingZone.h>
#include <Manager/HousingMgr.h>
#include <Network/PacketWrappers/ActorControlPacket143.h>
#include <Network/CommonActorControl.h>
#include "Framework.h"
@ -12,6 +12,7 @@ using namespace Sapphire;
using namespace Network;
using namespace Packets;
using namespace Server;
using namespace Sapphire::World::Manager;
class CmnDefHousingSignboard : public Sapphire::ScriptAPI::EventScript
{
@ -26,7 +27,7 @@ public:
{
auto pFw = getFramework();
if( !pFw )
return LandPurchaseResult::ERR_INTERNAL;
return LandPurchaseResult::ERR_INTERNAL;
// Purchase Land
if( result.param2 == 2 )
{
@ -35,8 +36,8 @@ public:
auto pTerritory = player.getCurrentZone();
auto pHousing = std::dynamic_pointer_cast< HousingZone >( pTerritory );
auto pHouMgr = pFw->get< Sapphire::HousingMgr >();
auto pHouMgr = pFw->get< HousingMgr >();
LandPurchaseResult res = pHouMgr->purchaseLand( player, activeLand.plot,
static_cast< uint8_t >( result.param2 ) );

View file

@ -3,7 +3,7 @@
#include <Framework.h>
#include <Exd/ExdDataGenerated.h>
#include <Zone/Zone.h>
#include <Territory/Zone.h>
using namespace Sapphire;

View file

@ -5,11 +5,11 @@
using namespace Sapphire;
class HousingEstateEntranceWarpTaxi :
class HousingEstateEntrance :
public Sapphire::ScriptAPI::EventObjectScript
{
public:
HousingEstateEntranceWarpTaxi() :
HousingEstateEntrance() :
Sapphire::ScriptAPI::EventObjectScript( 2002737 )
{
}

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
#include <Actor/Player.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

View file

@ -1,5 +1,5 @@
#include <ScriptObject.h>
#include <Zone/InstanceContent.h>
#include <Territory/InstanceContent.h>
using namespace Sapphire;

Some files were not shown because too many files have changed in this diff Show more