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

pass instancecontent by reference instead of shared ptr

Browse source
This commit is contained in:
NotAdam 2019-02-20 19:53:54 +11:00
parent 843ed1381f
commit cec2264d53
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -177,15 +177,15 @@ namespace Sapphire::ScriptAPI
{ {
} }
void InstanceContentScript::onInit( InstanceContentPtr instance ) void InstanceContentScript::onInit( InstanceContent& instance )
{ {
} }
void InstanceContentScript::onUpdate( InstanceContentPtr instance, uint32_t currTime ) void InstanceContentScript::onUpdate( InstanceContent& instance, uint32_t currTime )
{ {
} }
void InstanceContentScript::onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, void InstanceContentScript::onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId,
uint16_t param1, uint16_t param2 ) uint16_t param1, uint16_t param2 )
{ {
} }

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

@ -221,11 +221,11 @@ namespace Sapphire::ScriptAPI
public: public:
explicit InstanceContentScript( uint32_t instanceContentId ); explicit InstanceContentScript( uint32_t instanceContentId );
virtual void onInit( Sapphire::InstanceContentPtr instance ); virtual void onInit( Sapphire::InstanceContent& instance );
virtual void onUpdate( Sapphire::InstanceContentPtr instance, uint32_t currTime ); virtual void onUpdate( Sapphire::InstanceContent& instance, uint32_t currTime );
virtual void onEnterTerritory( Sapphire::InstanceContentPtr instance, Sapphire::Entity::Player& player, uint32_t eventId, virtual void onEnterTerritory( Sapphire::InstanceContent& instance, Sapphire::Entity::Player& player, uint32_t eventId,
uint16_t param1, uint16_t param2 ); uint16_t param1, uint16_t param2 );
}; };

6
src/world/Script/ScriptMgr.cpp
View file

@ -371,7 +371,7 @@ bool Sapphire::Scripting::ScriptMgr::onInstanceInit( InstanceContentPtr instance
auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::InstanceContentScript >( instance->getDirectorId() ); auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::InstanceContentScript >( instance->getDirectorId() );
if( script ) if( script )
{ {
script->onInit( instance ); script->onInit( *instance );
return true; return true;
} }
@ -384,7 +384,7 @@ bool Sapphire::Scripting::ScriptMgr::onInstanceUpdate( InstanceContentPtr instan
if( script ) if( script )
{ {
script->onUpdate( instance, currTime ); script->onUpdate( *instance, currTime );
return true; return true;
} }
@ -397,7 +397,7 @@ bool Sapphire::Scripting::ScriptMgr::onInstanceEnterTerritory( InstanceContentPt
auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::InstanceContentScript >( instance->getDirectorId() ); auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::InstanceContentScript >( instance->getDirectorId() );
if( script ) if( script )
{ {
script->onEnterTerritory( instance, player, eventId, param1, param2 ); script->onEnterTerritory( *instance, player, eventId, param1, param2 );
return true; return true;
} }