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

remove bindscene macro and move to wrapper func

Browse source
This commit is contained in:
Adam 2018-03-22 23:45:17 +11:00
parent bda2a51362
commit 00a7c1c6d3
6 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/servers/Scripts/ScriptObject.h
View file

@ -6,7 +6,4 @@
#include <Event/EventDefs.h> #include <Event/EventDefs.h>
#define BIND_SCENE( x ) std::bind( x, this, std::placeholders::_1 )
#endif //SAPPHIRE_SCRIPTOBJECT_H #endif //SAPPHIRE_SCRIPTOBJECT_H

4
src/servers/Scripts/quest/ManFst001.cpp
View file

@ -49,7 +49,7 @@ private:
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
player.playSceneChain( getId(), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, BIND_SCENE( &ManFst001::Scene00002 ) ); player.playSceneChain( getId(), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, bindScene( &ManFst001::Scene00002 ) );
} }
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
@ -66,7 +66,7 @@ private:
void Scene00004( Entity::Player& player ) void Scene00004( Entity::Player& player )
{ {
player.playSceneChain( getId(), 4, FADE_OUT | HIDE_HOTBAR | CONDITION_CUTSCENE | HIDE_UI, BIND_SCENE( &ManFst001::Scene00005 ) ); player.playSceneChain( getId(), 4, FADE_OUT | HIDE_HOTBAR | CONDITION_CUTSCENE | HIDE_UI, bindScene( &ManFst001::Scene00005 ) );
} }
void Scene00005( Entity::Player& player ) void Scene00005( Entity::Player& player )

4
src/servers/Scripts/quest/ManFst002.cpp
View file

@ -162,12 +162,12 @@ private:
void Scene00051( Entity::Player& player ) void Scene00051( Entity::Player& player )
{ {
player.playSceneChain( getId(), SEQ_1_ACTOR1_WAIT, NONE, BIND_SCENE( &ManFst002::Scene00001 )); player.playSceneChain( getId(), SEQ_1_ACTOR1_WAIT, NONE, bindScene( &ManFst002::Scene00001 ));
} }
void Scene00099( Entity::Player& player ) void Scene00099( Entity::Player& player )
{ {
player.playSceneChain( getId(), SEQ_1_ACTOR3_NPCTRADENO, NONE, BIND_SCENE( &ManFst002::Scene00005 )); player.playSceneChain( getId(), SEQ_1_ACTOR3_NPCTRADENO, NONE, bindScene( &ManFst002::Scene00005 ));
} }
void Scene00100( Entity::Player& player ) void Scene00100( Entity::Player& player )

8
src/servers/Scripts/quest/ManSea001.cpp
View file

@ -41,12 +41,12 @@ private:
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
player.playSceneChain( getId(), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, BIND_SCENE( &ManSea001::Scene00002 ) ); player.playSceneChain( getId(), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, bindScene( &ManSea001::Scene00002 ) );
} }
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
{ {
player.playSceneChain( getId(), 2, NONE, BIND_SCENE( &ManSea001::Scene00003 ) ); player.playSceneChain( getId(), 2, NONE, bindScene( &ManSea001::Scene00003 ) );
} }
void Scene00003( Entity::Player& player ) void Scene00003( Entity::Player& player )
@ -66,7 +66,7 @@ private:
void Scene00005( Entity::Player& player ) void Scene00005( Entity::Player& player )
{ {
player.playSceneChain( getId(), 5, HIDE_HOTBAR, BIND_SCENE( &ManSea001::Scene00006 ) ); player.playSceneChain( getId(), 5, HIDE_HOTBAR, bindScene( &ManSea001::Scene00006 ) );
} }
void Scene00006( Entity::Player& player ) void Scene00006( Entity::Player& player )
@ -103,7 +103,7 @@ private:
void Scene00011( Entity::Player& player ) void Scene00011( Entity::Player& player )
{ {
player.playSceneChain( getId(), 11, 0x2c02, 0, 0, BIND_SCENE( &ManSea001::Scene00012 ) ); player.playSceneChain( getId(), 11, 0x2c02, 0, 0, bindScene( &ManSea001::Scene00012 ) );
} }
void Scene00012( Entity::Player& player ) void Scene00012( Entity::Player& player )

2
src/servers/Scripts/quest/ManWil001.cpp
View file

@ -67,7 +67,7 @@ private:
void Scene00004( Entity::Player& player ) void Scene00004( Entity::Player& player )
{ {
player.playSceneChain( getId(), 4, 0x2c02, BIND_SCENE( &ManWil001::Scene00005 ) ); player.playSceneChain( getId(), 4, 0x2c02, bindScene( &ManWil001::Scene00005 ) );
} }
void Scene00005( Entity::Player& player ) void Scene00005( Entity::Player& player )

8
src/servers/sapphire_zone/Script/NativeScriptApi.h
View file

@ -4,6 +4,7 @@
#include <string> #include <string>
#include <typeinfo> #include <typeinfo>
#include <typeindex> #include <typeindex>
#include <sapphire_zone/Event/EventHandler.h>
#include "Forwards.h" #include "Forwards.h"
#ifdef _MSC_VER #ifdef _MSC_VER
@ -75,6 +76,13 @@ public:
class EventScript : public ScriptObject class EventScript : public ScriptObject
{ {
protected:
template< typename Ret, class Obj >
inline Event::EventHandler::SceneChainCallback bindScene( Ret ( Obj::*f )( Entity::Player& ) )
{
return std::bind( f, static_cast< Obj* >( this ), std::placeholders::_1 );
}
public: public:
explicit EventScript( uint32_t questId ) : explicit EventScript( uint32_t questId ) :
ScriptObject( questId, typeid( EventScript ).hash_code() ) ScriptObject( questId, typeid( EventScript ).hash_code() )