pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 10:31:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More faction calls [skip ci]

Browse Source
This commit is contained in:
Akkadius 2020-03-31 02:56:48 -05:00
parent 63eca22aac
commit 3b9016f503
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zone/client.cpp
View File

@ -7851,10 +7851,11 @@ void Client::SetFactionLevel(uint32 char_id, uint32 npc_id, uint8 char_class, ui
int32 current_value;
// Get the npc faction list
if (!database.GetNPCFactionList(npc_id, faction_id, npc_value, temp))
if (!content_db.GetNPCFactionList(npc_id, faction_id, npc_value, temp)) {
return;
for (int i = 0; i < MAX_NPC_FACTIONS; i++)
{
}
for (int i = 0; i < MAX_NPC_FACTIONS; i++) {
int32 faction_before_hit;
int32 faction_to_use_for_messaging;
FactionMods fm;

2
zone/npc.cpp
View File

@ -3195,7 +3195,7 @@ void NPC::AIYellForHelp(Mob *sender, Mob *attacker)
if (mob->GetLevel() >= 50 || attacker->GetLevelCon(mob->GetLevel()) != CON_GRAY) {
bool use_primary_faction = false;
if (mob->GetPrimaryFaction() == sender->CastToNPC()->GetPrimaryFaction()) {
const NPCFactionList *cf = database.GetNPCFactionEntry(mob->CastToNPC()->GetNPCFactionID());
const NPCFactionList *cf = content_db.GetNPCFactionEntry(mob->CastToNPC()->GetNPCFactionID());
if (cf) {
if (cf->assistprimaryfaction != 0) {
use_primary_faction = true;