From 9f2dee403c9a94a9dc3acf1b18898e5e3ddd6e32 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 2 Feb 2019 23:32:36 +1100
Subject: [PATCH] fix name inconsistency with bnpc kill script callbacks

---
 src/scripts/quest/subquest/gridania/SubFst002.cpp | 2 +-
 src/world/Actor/Player.cpp                        | 2 +-
 src/world/Script/NativeScriptApi.cpp              | 2 +-
 src/world/Script/NativeScriptApi.h                | 2 +-
 src/world/Script/ScriptMgr.cpp                    | 8 ++++----
 src/world/Script/ScriptMgr.h                      | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/scripts/quest/subquest/gridania/SubFst002.cpp b/src/scripts/quest/subquest/gridania/SubFst002.cpp
index d539d591..8dbd831b 100644
--- a/src/scripts/quest/subquest/gridania/SubFst002.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst002.cpp
@@ -68,7 +68,7 @@ public:
       Scene00001( player );
   }
 
-  void onNpcKill( uint32_t npcId, Entity::Player& player ) override
+  void onBNpcKill( uint32_t npcId, Entity::Player& player ) override
   {
     if( npcId != ENEMY0 )
       return;
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 76268f57..52130a41 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1133,7 +1133,7 @@ void Sapphire::Entity::Player::update( int64_t currTime )
 void Sapphire::Entity::Player::onMobKill( uint16_t nameId )
 {
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-  pScriptMgr->onMobKill( *getAsPlayer(), nameId );
+  pScriptMgr->onBNpcKill( *getAsPlayer(), nameId );
 }
 
 void Sapphire::Entity::Player::freePlayerSpawnId( uint32_t actorId )
diff --git a/src/world/Script/NativeScriptApi.cpp b/src/world/Script/NativeScriptApi.cpp
index 5c99828a..06e04cc2 100644
--- a/src/world/Script/NativeScriptApi.cpp
+++ b/src/world/Script/NativeScriptApi.cpp
@@ -111,7 +111,7 @@ namespace Sapphire::ScriptAPI
   {
   }
 
-  void EventScript::onNpcKill( uint32_t npcId, Entity::Player& player )
+  void EventScript::onBNpcKill( uint32_t nameId, Entity::Player& player )
   {
   }
 
diff --git a/src/world/Script/NativeScriptApi.h b/src/world/Script/NativeScriptApi.h
index de810b6c..a86a8c63 100644
--- a/src/world/Script/NativeScriptApi.h
+++ b/src/world/Script/NativeScriptApi.h
@@ -165,7 +165,7 @@ namespace Sapphire::ScriptAPI
 
     virtual void onTalk( uint32_t eventId, Sapphire::Entity::Player& player, uint64_t actorId );
 
-    virtual void onNpcKill( uint32_t npcId, Sapphire::Entity::Player& player );
+    virtual void onBNpcKill( uint32_t nameId, Sapphire::Entity::Player& player );
 
     virtual void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Sapphire::Entity::Player& player );
 
diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp
index 37967d1a..b8a59322 100644
--- a/src/world/Script/ScriptMgr.cpp
+++ b/src/world/Script/ScriptMgr.cpp
@@ -272,20 +272,20 @@ bool Sapphire::Scripting::ScriptMgr::onEventItem( Entity::Player& player, uint32
   return false;
 }
 
-bool Sapphire::Scripting::ScriptMgr::onMobKill( Entity::Player& player, uint16_t nameId )
+bool Sapphire::Scripting::ScriptMgr::onBNpcKill( Entity::Player& player, uint16_t nameId )
 {
   auto pEventMgr = framework()->get< World::Manager::EventMgr >();
 
   std::string eventName = "onBnpcKill_" + std::to_string( nameId );
 
-  // loop through all active quests and try to call available onMobKill callbacks
+  // loop through all active quests and try to call available onBNpcKill callbacks
   for( size_t i = 0; i < 30; i++ )
   {
     auto activeQuests = player.getQuestActive( static_cast< uint16_t >( i ) );
     if( !activeQuests )
       continue;
 
-    uint32_t questId = activeQuests->c.questId | 0x00010000;
+    uint32_t questId = activeQuests->c.questId | Event::EventHandler::EventHandlerType::Quest << 16;
 
     auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( questId );
     if( script )
@@ -294,7 +294,7 @@ bool Sapphire::Scripting::ScriptMgr::onMobKill( Entity::Player& player, uint16_t
 
       player.sendDebug( "Calling: {0}.{1}", objName, eventName );
 
-      script->onNpcKill( nameId, player );
+      script->onBNpcKill( nameId, player );
     }
   }
 
diff --git a/src/world/Script/ScriptMgr.h b/src/world/Script/ScriptMgr.h
index ca51f5fe..b2423ccf 100644
--- a/src/world/Script/ScriptMgr.h
+++ b/src/world/Script/ScriptMgr.h
@@ -68,7 +68,7 @@ namespace Sapphire::Scripting
     bool onEventItem( Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime,
                       uint64_t targetId );
 
-    bool onMobKill( Entity::Player& player, uint16_t nameId );
+    bool onBNpcKill( Entity::Player& player, uint16_t nameId );
 
     bool onCastFinish( Entity::Player& pPlayer, Entity::CharaPtr pTarget, uint32_t actionId );