mirror of
https://github.com/EQEmu/Server.git
synced 2026-09-01 11:36:36 +00:00
[Factions] Remove from shared memory and simplify (#3999)
* [Factions] Remove from shared memory and simplify - Removes factions from shared memory and moves to zone based storage of repositories and changes the NPC `faction_list` to also use repositories. - This affects NPC Factions and Faction Associations. * Bug fixes. * Update client.cpp * Update client.cpp * Update client.cpp * Cleanup * Update client.cpp * Update client.cpp * Update client.cpp * Final push * Update CMakeLists.txt * Consolidate reloading. * [Cleanup] PR # 3999 (#4039) * [Fixes for PR # 3999 * [Reload actual in game factions, not just the umbrella data. * syntax * Fix typo * Foix bug where primary_faction not filled in when no hits * Fix typos * Fix splash factions for kills. * Fix typo * Fix more variable names to be accurate * Fix Loads to load new ones as they come in. * Load npc_factions without primary (tasks) and support old task faction * Rename to make way for new LoadFactionAssocition (by faction_id) * Fix some review comments * Add code to load factions for splash tasks and quests. * Fix issue with sign and RewardFaction, fix Log Message --------- Co-authored-by: Paul Coene <noudess@gmail.com>
This commit is contained in:
+4
-2
@@ -26,6 +26,7 @@
|
||||
#include "../common/zone_store.h"
|
||||
#include "zonedump.h"
|
||||
#include "../common/loottable.h"
|
||||
#include "../common/repositories/npc_faction_entries_repository.h"
|
||||
|
||||
#include <deque>
|
||||
#include <list>
|
||||
@@ -296,7 +297,7 @@ public:
|
||||
void SetNPCFactionID(int32 in)
|
||||
{
|
||||
npc_faction_id = in;
|
||||
content_db.GetFactionIdsForNPC(npc_faction_id, &faction_list, &primary_faction);
|
||||
content_db.GetFactionIDsForNPC(npc_faction_id, &faction_list, &primary_faction);
|
||||
}
|
||||
|
||||
glm::vec4 m_SpawnPoint;
|
||||
@@ -564,7 +565,6 @@ protected:
|
||||
|
||||
friend class EntityList;
|
||||
friend class Aura;
|
||||
std::list<struct NPCFaction*> faction_list;
|
||||
uint32 copper;
|
||||
uint32 silver;
|
||||
uint32 gold;
|
||||
@@ -573,6 +573,8 @@ protected:
|
||||
uint32 spawn_group_id;
|
||||
uint16 wp_m;
|
||||
|
||||
std::list<NpcFactionEntriesRepository::NpcFactionEntries> faction_list;
|
||||
|
||||
int32 npc_faction_id;
|
||||
int32 primary_faction;
|
||||
int32 faction_amount;
|
||||
|
||||
Reference in New Issue
Block a user