Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/DataStores: Updated opcodes and db2 to 7.0.3.21414

Browse Source
This commit is contained in:
Shauren
2016-04-25 22:03:34 +02:00
parent 885d9b53c3
commit 70102f32fe
98 changed files with 3722 additions and 3593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/game/Reputation/ReputationMgr.cpp
View File

@@ -19,7 +19,6 @@
#include "DatabaseEnv.h"
#include "ReputationMgr.h"
#include "ReputationPackets.h"
#include "DBCStores.h"
#include "Player.h"
#include "WorldPacket.h"
#include "World.h"
@@ -235,11 +234,9 @@ void ReputationMgr::Initialize()
_exaltedFactionCount = 0;
_sendFactionIncreased = false;
for (unsigned int i = 1; i < sFactionStore.GetNumRows(); i++)
for (FactionEntry const* factionEntry : sFactionStore)
{
FactionEntry const* factionEntry = sFactionStore.LookupEntry(i);
if (factionEntry && factionEntry->CanHaveReputation())
if (factionEntry->CanHaveReputation())
{
FactionState newFaction;
newFaction.ID = factionEntry->ID;
@@ -283,7 +280,7 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi
{
float spillOverRepOut = float(standing);
// check for sub-factions that receive spillover
std::vector<uint32> const* flist = GetFactionTeamList(factionEntry->ID);
std::vector<uint32> const* flist = sDB2Manager.GetFactionTeamList(factionEntry->ID);
// if has no sub-factions, check for factions with same parent
if (!flist && factionEntry->ParentFactionID && factionEntry->ParentFactionModOut != 0.0f)
{
@@ -298,7 +295,7 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi
}
else // spill to "sister" factions
{
flist = GetFactionTeamList(factionEntry->ParentFactionID);
flist = sDB2Manager.GetFactionTeamList(factionEntry->ParentFactionID);
}
}
}

1
src/server/game/Reputation/ReputationMgr.h
View File

@@ -22,7 +22,6 @@
#include "Common.h"
#include "SharedDefines.h"
#include "Language.h"
#include "DBCStructure.h"
#include "QueryResult.h"
#include <map>