diff --git a/src/servers/Scripts/common/Aethernet.cpp b/src/servers/Scripts/common/Aethernet.cpp index 78e22b8b..d2ce1944 100644 --- a/src/servers/Scripts/common/Aethernet.cpp +++ b/src/servers/Scripts/common/Aethernet.cpp @@ -17,7 +17,7 @@ public: Aethernet() : EventScript( EVENTSCRIPT_AETHERNET_ID ) {} - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { if( player.isAetheryteRegistered( eventId & 0xFFFF ) ) { diff --git a/src/servers/Scripts/common/Aetheryte.cpp b/src/servers/Scripts/common/Aetheryte.cpp index 800d5c8f..7fb3610c 100644 --- a/src/servers/Scripts/common/Aetheryte.cpp +++ b/src/servers/Scripts/common/Aetheryte.cpp @@ -19,7 +19,7 @@ public: Aetheryte() : EventScript( EVENTSCRIPT_AETHERYTE_ID ) {} - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { if( player.isAetheryteRegistered( eventId & 0xFFFF ) ) { diff --git a/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp b/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp index d3730d60..2755dec8 100644 --- a/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp +++ b/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp @@ -31,7 +31,7 @@ public: player.playScene( getId(), 1, 0xFB2EC8F8, 0, 1, returnScene, callback ); } - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { Scene00000( player ); } diff --git a/src/servers/Scripts/common/CmnDefInnBed.cpp b/src/servers/Scripts/common/CmnDefInnBed.cpp index b97f129b..acd39ca7 100644 --- a/src/servers/Scripts/common/CmnDefInnBed.cpp +++ b/src/servers/Scripts/common/CmnDefInnBed.cpp @@ -46,7 +46,7 @@ public: player.playScene( getId(), 100, 0x800, 0, 0, callback ); } - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { Scene00000( player ); } diff --git a/src/servers/Scripts/common/CmnDefLinkShell.cpp b/src/servers/Scripts/common/CmnDefLinkShell.cpp index c5758211..e9fb376e 100644 --- a/src/servers/Scripts/common/CmnDefLinkShell.cpp +++ b/src/servers/Scripts/common/CmnDefLinkShell.cpp @@ -53,7 +53,7 @@ public: player.playScene( getId(), 4, 0, 0, 0 ); } - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { Scene00001( player ); } diff --git a/src/servers/Scripts/common/HouFurOrchestrion.cpp b/src/servers/Scripts/common/HouFurOrchestrion.cpp index 2269789e..d9b33723 100644 --- a/src/servers/Scripts/common/HouFurOrchestrion.cpp +++ b/src/servers/Scripts/common/HouFurOrchestrion.cpp @@ -13,7 +13,7 @@ public: player.playScene( getId(), 0, 0x2000, 0, 1 ); } - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { Scene00000( player ); } diff --git a/src/servers/Scripts/quest/ManFst001.cpp b/src/servers/Scripts/quest/ManFst001.cpp index a351e61c..72b67c24 100644 --- a/src/servers/Scripts/quest/ManFst001.cpp +++ b/src/servers/Scripts/quest/ManFst001.cpp @@ -87,9 +87,9 @@ public: ManFst001() : EventScript( 65575 ) {} - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); + uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( actor == ACTOR0 ) Scene00000( player ); diff --git a/src/servers/Scripts/quest/ManFst002.cpp b/src/servers/Scripts/quest/ManFst002.cpp index 153fb9a0..4c0c7c85 100644 --- a/src/servers/Scripts/quest/ManFst002.cpp +++ b/src/servers/Scripts/quest/ManFst002.cpp @@ -187,9 +187,9 @@ public: ManFst002() : EventScript( 65621 ) {} - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); + uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( actor == ACTOR0 ) Scene00000( player ); diff --git a/src/servers/Scripts/quest/ManFst003.cpp b/src/servers/Scripts/quest/ManFst003.cpp index 25344bf2..5188af19 100644 --- a/src/servers/Scripts/quest/ManFst003.cpp +++ b/src/servers/Scripts/quest/ManFst003.cpp @@ -18,7 +18,7 @@ public: ManFst003() : EventScript( 65659 ) {} - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { } diff --git a/src/servers/Scripts/quest/ManFst004.cpp b/src/servers/Scripts/quest/ManFst004.cpp index da1fb49b..20239b53 100644 --- a/src/servers/Scripts/quest/ManFst004.cpp +++ b/src/servers/Scripts/quest/ManFst004.cpp @@ -77,9 +77,9 @@ public: ////////////////////////////////////////////////////////////////////// // Event Handlers - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); + uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( actor == ManFst004::Actor0 ) { diff --git a/src/servers/Scripts/quest/ManSea001.cpp b/src/servers/Scripts/quest/ManSea001.cpp index 7f0a8840..f8a2a893 100644 --- a/src/servers/Scripts/quest/ManSea001.cpp +++ b/src/servers/Scripts/quest/ManSea001.cpp @@ -134,9 +134,9 @@ public: ManSea001() : EventScript( 65643 ) {} - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); + uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( actor == ACTOR0 ) Scene00000( player ); diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp index 9817969a..285ea9ba 100644 --- a/src/servers/Scripts/quest/ManSea002.cpp +++ b/src/servers/Scripts/quest/ManSea002.cpp @@ -143,9 +143,9 @@ public: ManSea002() : EventScript( 65644 ) {} - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); + uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); // todo: this doesn't actually play a cutscene after accepting the quest if( actor == ACTOR0 ) diff --git a/src/servers/Scripts/quest/ManWil001.cpp b/src/servers/Scripts/quest/ManWil001.cpp index 8a3f0dfd..2258b304 100644 --- a/src/servers/Scripts/quest/ManWil001.cpp +++ b/src/servers/Scripts/quest/ManWil001.cpp @@ -129,9 +129,9 @@ public: ManWil001() : EventScript( 66130 ) {} - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); + uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( actor == ACTOR0 ) Scene00000( player ); diff --git a/src/servers/Scripts/quest/ManWil002.cpp b/src/servers/Scripts/quest/ManWil002.cpp index 55530020..f77d074f 100644 --- a/src/servers/Scripts/quest/ManWil002.cpp +++ b/src/servers/Scripts/quest/ManWil002.cpp @@ -150,9 +150,9 @@ public: ManWil002() : EventScript( 66104 ) { } - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); + uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( actor == ACTOR0 ) Scene00000( player ); diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp index 4c22f807..462f1c92 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp @@ -66,9 +66,9 @@ public: SubFst001() : EventScript( 65560 ) {} - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId )); + uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId )); if( actor == ACTOR0 ) { diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp index 505a601c..e9eb28a6 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp @@ -52,9 +52,9 @@ public: SubFst002() : EventScript( 65561 ) {} - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); + uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( actor == ACTOR0 && !player.hasQuest( getId() ) ) Scene00000( player ); diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp index a7053079..4402a50f 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp @@ -48,9 +48,9 @@ public: SubFst010() : EventScript( 65537 ) {} - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); + uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( actor == ACTOR0 ) Scene00000( player ); diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp index 6c5e2b99..2dd05971 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp @@ -154,9 +154,9 @@ public: SubFst013() : EventScript( 65576 ) {} - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); + uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( !player.hasQuest( getId())) { @@ -176,7 +176,7 @@ public: void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId )); + uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId )); if( actor == ACTOR1 && emoteId == 5 && player.getQuestSeq( getId() ) == SEQ_1 ) Scene00100( player ); diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h index fe1e5244..16eb268b 100644 --- a/src/servers/sapphire_zone/Script/NativeScriptApi.h +++ b/src/servers/sapphire_zone/Script/NativeScriptApi.h @@ -88,7 +88,7 @@ public: ScriptObject( questId, typeid( EventScript ).hash_code() ) { } - virtual void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) { } + virtual void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) { } virtual void onNpcKill( uint32_t npcId, Entity::Player& player ) { } virtual void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) { } virtual void onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { } diff --git a/src/tools/quest_parser/main.cpp b/src/tools/quest_parser/main.cpp index 9c4098f8..69b48b26 100644 --- a/src/tools/quest_parser/main.cpp +++ b/src/tools/quest_parser/main.cpp @@ -24,9 +24,9 @@ Core::Logger g_log; Core::Data::ExdDataGenerated g_exdDataGen; const std::string onTalkStr( - " void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override\n" + " void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override\n" " {\n" - " auto actor = Event::mapEventActorToRealActor( actorId );\n" + " uint32_t actor = Event::mapEventActorToRealActor( actorId );\n" " }\n\n" ); @@ -67,6 +67,9 @@ void createScript( boost::shared_ptr< Core::Data::Quest >& pQuestData, std::set< "// In order for this script to be loaded, change its extension to .cpp\n" "// and move it to the correct folder in /scripts/native/\n" "\n" + "#include