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

refactoring and export define fix

Browse source
This commit is contained in:
GokuWeedLord 2017-12-10 03:01:21 +11:00
parent 0f962abe09
commit 076b2591d4
2 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/native/statuseffect/StatusEffect50.cpp
View file

@ -1,6 +1,6 @@
#include "../ScriptObject.h" #include "../ScriptObject.h"
class StatusEffect50 : StatusEffectScript class StatusEffect50 : public StatusEffectScript
{ {
public: public:
StatusEffect50() : StatusEffectScript( "StatusEffect50", 50 ) StatusEffect50() : StatusEffectScript( "StatusEffect50", 50 )
@ -8,10 +8,8 @@ public:
virtual void onTick( Core::Entity::ActorPtr actor ) virtual void onTick( Core::Entity::ActorPtr actor )
{ {
} }
}; };
//extern "C" __declspec( dllexport ) __cdecl StatusEffectScript* getStatusEffectScript() { return static_cast< StatusEffectScript* >( new StatusEffect50 ); } EXPORT_STATUSEFFECTSCRIPT( StatusEffect50 )
//EXPORT_STATUSEFFECTSCRIPT( StatusEffect50 )

30
src/servers/Server_Zone/Script/NativeScriptApi.h
View file

@ -7,7 +7,7 @@
#include <StatusEffect/StatusEffect.h> #include <StatusEffect/StatusEffect.h>
#define EXPORT_SCRIPTOBJECT( type, base ) \ #define EXPORT_SCRIPTOBJECT( type, base ) \
extern "C" __declspec( dllexport ) __cdecl base* get##base() \ extern "C" __declspec( dllexport ) base* get##base() \
{ return static_cast< base* >( new type ); } { return static_cast< base* >( new type ); }
#define EXPORT_STATUSEFFECTSCRIPT( type ) EXPORT_SCRIPTOBJECT( type, StatusEffectScript ) #define EXPORT_STATUSEFFECTSCRIPT( type ) EXPORT_SCRIPTOBJECT( type, StatusEffectScript )
@ -33,7 +33,7 @@ public:
}; };
class StatusEffectScript : ScriptObject class StatusEffectScript : public ScriptObject
{ {
protected: protected:
const uint32_t m_effectId; const uint32_t m_effectId;
@ -49,20 +49,18 @@ public:
return m_effectId; return m_effectId;
} }
virtual void onTick( Core::Entity::ActorPtr actor ) { }
virtual Core::StatusEffect::StatusEffect applyEffect( Core::Entity::Actor sourceActor, Core::Entity::Actor targetActor ) { } virtual void onApply( Core::Entity::ActorPtr actor ) { }
virtual void onTick(Core::Entity::ActorPtr actor) { } virtual void onRemove( Core::Entity::ActorPtr actor ) { }
virtual void onApply(Core::Entity::ActorPtr actor) { }
virtual void onRemove( Core::Entity::Actor actor ) { }
virtual void onExpire(Core::Entity::ActorPtr actor) { } virtual void onExpire(Core::Entity::ActorPtr actor) { }
virtual void onPlayerCollision( Core::Entity::Actor actor, Core::Entity::Actor actorHit ) { } virtual void onPlayerCollision( Core::Entity::ActorPtr actor, Core::Entity::ActorPtr actorHit ) { }
virtual void onPlayerFinishCast( Core::Entity::Actor actor ) { } virtual void onPlayerFinishCast( Core::Entity::ActorPtr actor ) { }
virtual void onPlayerDamaged( Core::Entity::Actor actor ) { } virtual void onPlayerDamaged( Core::Entity::ActorPtr actor ) { }
virtual bool onPlayerDeath( Core::Entity::Actor actor ) { } virtual void onPlayerDeath( Core::Entity::ActorPtr actor ) { }
}; };
class AbilityScript : ScriptObject class AbilityScript : public ScriptObject
{ {
protected: protected:
const uint32_t m_abilityId; const uint32_t m_abilityId;
@ -79,12 +77,12 @@ public:
} }
virtual void onStart( Core::Entity::Actor sourceActor, Core::Entity::Actor targetActor ) { } virtual void onStart( Core::Entity::Actor sourceActor, Core::Entity::Actor targetActor ) { }
virtual bool onCastFinish(Core::Entity::Player player, Core::Entity::ActorPtr targetActor) { } virtual void onCastFinish(Core::Entity::Player player, Core::Entity::ActorPtr targetActor) { }
virtual void onInterrupt( Core::Entity::Actor sourceActor/*, Core::Entity::Actor targetActor*/ ) { } virtual void onInterrupt( Core::Entity::Actor sourceActor/*, Core::Entity::Actor targetActor*/ ) { }
}; };
class QuestScript : ScriptObject class QuestScript : public ScriptObject
{ {
protected: protected:
const uint32_t m_questId; const uint32_t m_questId;
@ -106,7 +104,7 @@ public:
}; };
class BattleNpcScript : ScriptObject class BattleNpcScript : public ScriptObject
{ {
protected: protected:
const uint32_t m_npcId; const uint32_t m_npcId;
@ -123,7 +121,7 @@ public:
} }
}; };
class ZoneScript : ScriptObject class ZoneScript : public ScriptObject
{ {
protected: protected:
const uint32_t m_zoneId; const uint32_t m_zoneId;