mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-28 07:07:45 +00:00
Code Activity

rename ScriptObject getFramework to framework for consistency

Browse source
This commit is contained in:
NotAdam 2019-03-23 16:57:00 +11:00
parent 9df536794b
commit 57d11460d6
8 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/scripts/common/GilShop.cpp
View file

@ -31,7 +31,7 @@ private:
// buy // buy
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
auto shopMgr = getFramework()->get< Sapphire::World::Manager::ShopMgr >(); auto shopMgr = framework()->get< Sapphire::World::Manager::ShopMgr >();
shopMgr->purchaseGilShopItem( player, result.eventId, result.param3, result.param4 ); shopMgr->purchaseGilShopItem( player, result.eventId, result.param3, result.param4 );
} }

2
src/scripts/common/aethernet/Aetheryte.cpp
View file

@ -108,7 +108,7 @@ public:
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto pExdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >(); auto pExdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
if( !pExdData ) if( !pExdData )
return; return;

4
src/scripts/common/aethernet/HousingAethernet.cpp
View file

@ -21,7 +21,7 @@ public:
{ {
player.playScene( eventId, 0, HIDE_HOTBAR | NO_DEFAULT_CAMERA, [this, eventId]( Entity::Player& player, const Event::SceneResult& result ) player.playScene( eventId, 0, HIDE_HOTBAR | NO_DEFAULT_CAMERA, [this, eventId]( Entity::Player& player, const Event::SceneResult& result )
{ {
auto pExdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >(); auto pExdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
if( !pExdData ) if( !pExdData )
return; return;
@ -42,7 +42,7 @@ public:
// moving a player inside an event will crash the game so we end it hre // moving a player inside an event will crash the game so we end it hre
player.eventFinish( eventId, 1 ); player.eventFinish( eventId, 1 );
auto playerMgr = getFramework()->get< Sapphire::World::Manager::PlayerMgr >(); auto playerMgr = framework()->get< Sapphire::World::Manager::PlayerMgr >();
playerMgr->movePlayerToLandDestination( player, pHousingAethernet->level, housingZone->getWardNum() ); playerMgr->movePlayerToLandDestination( player, pHousingAethernet->level, housingZone->getWardNum() );
} ); } );
} }

2
src/scripts/common/eobj/HousingEstateEntrance.cpp
View file

@ -26,7 +26,7 @@ public:
if( result.param2 != 1 ) if( result.param2 != 1 )
return; return;
auto terriMgr = getFramework()->get< Sapphire::World::Manager::TerritoryMgr >(); auto terriMgr = framework()->get< Sapphire::World::Manager::TerritoryMgr >();
if( !terriMgr ) if( !terriMgr )
return; return;

2
src/scripts/common/housing/CmnDefHousingSignboard.cpp
View file

@ -26,7 +26,7 @@ public:
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result )
{ {
auto pFw = getFramework(); auto pFw = framework();
if( !pFw ) if( !pFw )
return LandPurchaseResult::ERR_INTERNAL; return LandPurchaseResult::ERR_INTERNAL;
// Purchase Land // Purchase Land

6
src/scripts/common/warptaxi/WarpTaxi.cpp
View file

@ -27,12 +27,12 @@ public:
player.eventFinish( 1310721, 0 ); player.eventFinish( 1310721, 0 );
player.eventFinish( getId(), 1 ); player.eventFinish( getId(), 1 );
auto exdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >(); auto exdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
auto warp = exdData->get< Sapphire::Data::Warp >( getId() ); auto warp = exdData->get< Sapphire::Data::Warp >( getId() );
if( !warp ) if( !warp )
return; return;
auto playerMgr = getFramework()->get< Sapphire::World::Manager::PlayerMgr >(); auto playerMgr = framework()->get< Sapphire::World::Manager::PlayerMgr >();
playerMgr->movePlayerToLandDestination( player, warp->level, result.param3 ); playerMgr->movePlayerToLandDestination( player, warp->level, result.param3 );
} }
else else
@ -56,7 +56,7 @@ public:
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto exdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >(); auto exdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
if( !exdData ) if( !exdData )
return; return;

2
src/world/Script/NativeScriptApi.cpp
View file

@ -37,7 +37,7 @@ namespace Sapphire::ScriptAPI
m_framework = fw; m_framework = fw;
} }
Sapphire::Framework* ScriptObject::getFramework() const Sapphire::Framework* ScriptObject::framework() const
{ {
return m_framework; return m_framework;
} }

2
src/world/Script/NativeScriptApi.h
View file

@ -61,7 +61,7 @@ namespace Sapphire::ScriptAPI
* *
* @return A pointer to Core::Framework * @return A pointer to Core::Framework
*/ */
virtual Sapphire::Framework* getFramework() const; virtual Sapphire::Framework* framework() const;
}; };