diff options
author | Subv <s.v.h21@hotmail.com> | 2012-02-14 12:46:26 -0500 |
---|---|---|
committer | Subv <s.v.h21@hotmail.com> | 2012-02-14 12:46:26 -0500 |
commit | 8a72aede1641ae19d539ed807e3bb0458c7a65e8 (patch) | |
tree | 19244d00341860f4f7f872af68763b9eaf2e0331 /src/server/game/Globals/ObjectMgr.cpp | |
parent | f1182f0884e6d1eb5a279550d1b92d02cddb7c56 (diff) |
Codestyle: Renamed some variables to fit codestyle, corrected order in structure/class fields to match alignment (they use slightly less memory now)
Signed-off-by: Subv <s.v.h21@hotmail.com>
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rwxr-xr-x | src/server/game/Globals/ObjectMgr.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 52b33cf1e6f..2feb2eddf76 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -6827,15 +6827,15 @@ void ObjectMgr::LoadReputationOnKill() uint32 creature_id = fields[0].GetUInt32(); ReputationOnKillEntry repOnKill; - repOnKill.repfaction1 = fields[1].GetUInt32(); - repOnKill.repfaction2 = fields[2].GetUInt32(); - repOnKill.is_teamaward1 = fields[3].GetBool(); - repOnKill.reputation_max_cap1 = fields[4].GetUInt32(); - repOnKill.repvalue1 = fields[5].GetInt32(); - repOnKill.is_teamaward2 = fields[6].GetBool(); - repOnKill.reputation_max_cap2 = fields[7].GetUInt32(); - repOnKill.repvalue2 = fields[8].GetInt32(); - repOnKill.team_dependent = fields[9].GetUInt8(); + repOnKill.RepFaction1 = fields[1].GetUInt32(); + repOnKill.RepFaction2 = fields[2].GetUInt32(); + repOnKill.IsTeamAward1 = fields[3].GetBool(); + repOnKill.ReputationMaxCap1 = fields[4].GetUInt32(); + repOnKill.RepValue1 = fields[5].GetInt32(); + repOnKill.IsTeamAward2 = fields[6].GetBool(); + repOnKill.ReputationMaxCap2 = fields[7].GetUInt32(); + repOnKill.RepValue2 = fields[8].GetInt32(); + repOnKill.TeamDependent = fields[9].GetUInt8(); if (!GetCreatureTemplate(creature_id)) { @@ -6843,22 +6843,22 @@ void ObjectMgr::LoadReputationOnKill() continue; } - if (repOnKill.repfaction1) + if (repOnKill.RepFaction1) { - FactionEntry const* factionEntry1 = sFactionStore.LookupEntry(repOnKill.repfaction1); + FactionEntry const* factionEntry1 = sFactionStore.LookupEntry(repOnKill.RepFaction1); if (!factionEntry1) { - sLog->outErrorDb("Faction (faction.dbc) %u does not exist but is used in `creature_onkill_reputation`", repOnKill.repfaction1); + sLog->outErrorDb("Faction (faction.dbc) %u does not exist but is used in `creature_onkill_reputation`", repOnKill.RepFaction1); continue; } } - if (repOnKill.repfaction2) + if (repOnKill.RepFaction2) { - FactionEntry const* factionEntry2 = sFactionStore.LookupEntry(repOnKill.repfaction2); + FactionEntry const* factionEntry2 = sFactionStore.LookupEntry(repOnKill.RepFaction2); if (!factionEntry2) { - sLog->outErrorDb("Faction (faction.dbc) %u does not exist but is used in `creature_onkill_reputation`", repOnKill.repfaction2); + sLog->outErrorDb("Faction (faction.dbc) %u does not exist but is used in `creature_onkill_reputation`", repOnKill.RepFaction2); continue; } } |