mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10665] Allow use faction data for cases raceMask==0

Browse source 
Also some related code cleanup

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
emsy 2010-11-01 04:02:59 +03:00 • committed by VladimirMangos
parent 549b44d8ec
commit 3ada9f635f
3 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/game/DBCStructure.h
View file

@ -821,6 +821,20 @@ struct FactionEntry
// 39 string flags // 39 string flags
//char* description[16]; // 40-55 m_description_lang //char* description[16]; // 40-55 m_description_lang
// 56 string flags // 56 string flags
// helpers
int GetIndexFitTo(uint32 raceMask, uint32 classMask) const
{
for (int i = 0; i < 4; ++i)
{
if ((BaseRepRaceMask[i] == 0 || (BaseRepRaceMask[i] & raceMask)) &&
(BaseRepClassMask[i] == 0 || (BaseRepClassMask[i] & classMask)))
return i;
}
return -1;
}
}; };
struct FactionTemplateEntry struct FactionTemplateEntry

24
src/game/ReputationMgr.cpp
View file

@ -56,16 +56,10 @@ int32 ReputationMgr::GetBaseReputation(FactionEntry const* factionEntry) const
uint32 raceMask = m_player->getRaceMask(); uint32 raceMask = m_player->getRaceMask();
uint32 classMask = m_player->getClassMask(); uint32 classMask = m_player->getClassMask();
for (int i=0; i < 4; i++)
{
if( (factionEntry->BaseRepRaceMask[i] & raceMask) &&
(factionEntry->BaseRepClassMask[i]==0 ||
(factionEntry->BaseRepClassMask[i] & classMask) ) )
return factionEntry->BaseRepValue[i];
}
// in faction.dbc exist factions with (RepListId >=0, listed in character reputation list) with all BaseRepRaceMask[i]==0 int idx = factionEntry->GetIndexFitTo(raceMask, classMask);
return 0;
return idx >= 0 ? factionEntry->BaseRepValue[idx] : 0;
} }
int32 ReputationMgr::GetReputation(FactionEntry const* factionEntry) const int32 ReputationMgr::GetReputation(FactionEntry const* factionEntry) const
@ -107,14 +101,10 @@ uint32 ReputationMgr::GetDefaultStateFlags(FactionEntry const* factionEntry) con
uint32 raceMask = m_player->getRaceMask(); uint32 raceMask = m_player->getRaceMask();
uint32 classMask = m_player->getClassMask(); uint32 classMask = m_player->getClassMask();
for (int i=0; i < 4; i++)
{ int idx = factionEntry->GetIndexFitTo(raceMask, classMask);
if( (factionEntry->BaseRepRaceMask[i] & raceMask) &&
(factionEntry->BaseRepClassMask[i]==0 || return idx >= 0 ? factionEntry->ReputationFlags[idx] : 0;
(factionEntry->BaseRepClassMask[i] & classMask) ) )
return factionEntry->ReputationFlags[i];
}
return 0;
} }
void ReputationMgr::SendForceReactions() void ReputationMgr::SendForceReactions()

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10664" #define REVISION_NR "10665"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__