From 5802c813fe902e306aa1f2f4fb20fc2934cd16b4 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sat, 23 Mar 2019 17:02:47 +1100 Subject: [PATCH] more naming and style consistency in ScriptAPI --- src/world/Script/NativeScriptApi.cpp | 8 ++++---- src/world/Script/NativeScriptApi.h | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/world/Script/NativeScriptApi.cpp b/src/world/Script/NativeScriptApi.cpp index 6069c011..3eeb5912 100644 --- a/src/world/Script/NativeScriptApi.cpp +++ b/src/world/Script/NativeScriptApi.cpp @@ -102,8 +102,8 @@ namespace Sapphire::ScriptAPI /////////////////////////////////////////////////////////////////// - EventScript::EventScript( uint32_t questId ) : - ScriptObject( questId, typeid( EventScript ).hash_code() ) + EventScript::EventScript( uint32_t eventId ) : + ScriptObject( eventId, typeid( EventScript ).hash_code() ) { } @@ -131,8 +131,8 @@ namespace Sapphire::ScriptAPI { } - void - EventScript::onEventItem( Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime, uint64_t targetId ) + void EventScript::onEventItem( Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime, + uint64_t targetId ) { } diff --git a/src/world/Script/NativeScriptApi.h b/src/world/Script/NativeScriptApi.h index c534590e..49fa1288 100644 --- a/src/world/Script/NativeScriptApi.h +++ b/src/world/Script/NativeScriptApi.h @@ -161,7 +161,7 @@ namespace Sapphire::ScriptAPI } public: - explicit EventScript( uint32_t questId ); + explicit EventScript( uint32_t eventId ); 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 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 - onEventItem( Sapphire::Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime, uint64_t targetId ); + virtual void onEventItem( Sapphire::Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime, + uint64_t targetId ); virtual void onEventHandlerTradeReturn( Sapphire::Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param, uint32_t catalogId ); @@ -228,7 +228,7 @@ namespace Sapphire::ScriptAPI virtual void onUpdate( Sapphire::InstanceContent& instance, uint32_t currTime ); 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 ); }; }