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

more naming and style consistency in ScriptAPI

Browse source
This commit is contained in:
NotAdam 2019-03-23 17:02:47 +11:00
parent ba5fc6781d
commit 5802c813fe
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,8 +102,8 @@ namespace Sapphire::ScriptAPI
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
EventScript::EventScript( uint32_t questId ) : EventScript::EventScript( uint32_t eventId ) :
ScriptObject( questId, typeid( EventScript ).hash_code() ) ScriptObject( eventId, typeid( EventScript ).hash_code() )
{ {
} }
@ -131,8 +131,8 @@ namespace Sapphire::ScriptAPI
{ {
} }
void void EventScript::onEventItem( Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime,
EventScript::onEventItem( Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime, uint64_t targetId ) uint64_t targetId )
{ {
} }

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

@ -161,7 +161,7 @@ namespace Sapphire::ScriptAPI
} }
public: public:
explicit EventScript( uint32_t questId ); explicit EventScript( uint32_t eventId );
virtual void onTalk( uint32_t eventId, Sapphire::Entity::Player& player, uint64_t actorId ); virtual void onTalk( uint32_t eventId, Sapphire::Entity::Player& player, uint64_t actorId );
@ -171,12 +171,12 @@ namespace Sapphire::ScriptAPI
virtual void onEnterTerritory( Sapphire::Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ); virtual void onEnterTerritory( Sapphire::Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 );
virtual void onWithinRange( Sapphire::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ); virtual void onWithinRange( Sapphire::Entity::Player& player, uint32_t eventId, uint32_t param1,float x, float y, float z );
virtual void onOutsideRange( Sapphire::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ); virtual void onOutsideRange( Sapphire::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z );
virtual void virtual void onEventItem( Sapphire::Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime,
onEventItem( Sapphire::Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime, uint64_t targetId ); uint64_t targetId );
virtual void onEventHandlerTradeReturn( Sapphire::Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param, virtual void onEventHandlerTradeReturn( Sapphire::Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param,
uint32_t catalogId ); uint32_t catalogId );
@ -228,7 +228,7 @@ namespace Sapphire::ScriptAPI
virtual void onUpdate( Sapphire::InstanceContent& instance, uint32_t currTime ); virtual void onUpdate( Sapphire::InstanceContent& instance, uint32_t currTime );
virtual void onEnterTerritory( Sapphire::InstanceContent& 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 );
}; };
} }