From a8bb58e51c2cc1412b9cad1a3c7e2020210a454c Mon Sep 17 00:00:00 2001 From: Mordred Date: Mon, 15 Apr 2019 23:45:58 +0200 Subject: [PATCH] Use a common definition for BNpcType --- src/common/Common.h | 6 ++++++ .../instances/questbattles/ChasingShadows.cpp | 15 ++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/common/Common.h b/src/common/Common.h index 38d174ac..a2d59028 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -63,6 +63,12 @@ namespace Sapphire::Common GmTellMsg = 0x4, }; + enum BNpcType : uint8_t + { + Friendly = 0, + Enemy = 4, + }; + enum ObjKind : uint8_t { None = 0x00, diff --git a/src/scripts/instances/questbattles/ChasingShadows.cpp b/src/scripts/instances/questbattles/ChasingShadows.cpp index 5033b596..ca04cfed 100644 --- a/src/scripts/instances/questbattles/ChasingShadows.cpp +++ b/src/scripts/instances/questbattles/ChasingShadows.cpp @@ -40,14 +40,19 @@ public: void onInit( QuestBattle& instance ) override { instance.registerEObj( "unknown_0", 2005192, 5760474, 4, { -51.493111f, 0.309087f, 71.436897f }, 1.000000f, -0.000006f ); - auto a1 = instance.createBNpcFromLevelEntry( INIT_POP_BOSS, 12, 0, 21141, 939, instance.getDirectorId(), 4 ); - auto a2 = instance.createBNpcFromLevelEntry( INIT_POP_ENEMY_B_01, 10, 0, 1440, 938, instance.getDirectorId(), 4 ); - auto a3 = instance.createBNpcFromLevelEntry( INIT_POP_ENEMY_B_02, 10, 0, 1440, 938, instance.getDirectorId(), 4 ); + auto a1 = instance.createBNpcFromLevelEntry( INIT_POP_BOSS, 12, 0, 21141, 939, + instance.getDirectorId(), Common::BNpcType::Enemy ); + auto a2 = instance.createBNpcFromLevelEntry( INIT_POP_ENEMY_B_01, 10, 0, 1440, 938, + instance.getDirectorId(), Common::BNpcType::Enemy ); + auto a3 = instance.createBNpcFromLevelEntry( INIT_POP_ENEMY_B_02, 10, 0, 1440, 938, + instance.getDirectorId(), Common::BNpcType::Enemy ); instance.pushActor( a1 ); instance.pushActor( a2 ); instance.pushActor( a3 ); - auto a4 = instance.createBNpcFromLevelEntry( INIT_P_POP_IDA, 50, 0, 27780, 1375, instance.getDirectorId(), 0 ); - auto a5 = instance.createBNpcFromLevelEntry( INIT_P_POP_PAPARIMO, 50, 0, 27780, 1376, instance.getDirectorId(), 0 ); + auto a4 = instance.createBNpcFromLevelEntry( INIT_P_POP_IDA, 50, 0, 27780, 1375, + instance.getDirectorId(), Common::BNpcType::Friendly ); + auto a5 = instance.createBNpcFromLevelEntry( INIT_P_POP_PAPARIMO, 50, 0, 27780, 1376, + instance.getDirectorId(), Common::BNpcType::Friendly ); instance.pushActor( a4 ); instance.pushActor( a5 ); }