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

[Cleanup] Utilize SetFilter in client.cpp (#3036)

Browse Source 
# Notes
- This function was unused, make use of it.
This commit is contained in:
Alex King 2023-03-05 12:19:22 -05:00 committed by GitHub
parent b53310e23b
commit 8c9adca852
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 67 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
zone/client.cpp
View File

@ -181,9 +181,10 @@ Client::Client(EQStreamInterface *ieqs) : Mob(
consent_throttle_timer(2000), consent_throttle_timer(2000),
tmSitting(0) tmSitting(0)
{ {
for (auto client_filter = FilterNone; client_filter < _FilterCount; client_filter = eqFilterType(client_filter + 1)) {
SetFilter(client_filter, FilterShow);
}
for (int client_filter = 0; client_filter < _FilterCount; client_filter++)
ClientFilters[client_filter] = FilterShow;
cheat_manager.SetClient(this); cheat_manager.SetClient(this);
mMovementManager->AddClient(this); mMovementManager->AddClient(this);
character_id = 0; character_id = 0;
@ -3095,14 +3096,14 @@ void Client::ServerFilter(SetServerFilter_Struct* filter){
*/ */
#define Filter0(type) \ #define Filter0(type) \
if(filter->filters[type] == 1) \ if(filter->filters[type] == 1) \
ClientFilters[type] = FilterShow; \ SetFilter(type, FilterShow); \
else \ else \
ClientFilters[type] = FilterHide; SetFilter(type, FilterHide);
#define Filter1(type) \ #define Filter1(type) \
if(filter->filters[type] == 0) \ if(filter->filters[type] == 0) \
ClientFilters[type] = FilterShow; \ SetFilter(type, FilterShow); \
else \ else \
ClientFilters[type] = FilterHide; SetFilter(type, FilterHide);
Filter0(FilterGuildChat); Filter0(FilterGuildChat);
Filter0(FilterSocials); Filter0(FilterSocials);
@ -3112,44 +3113,49 @@ void Client::ServerFilter(SetServerFilter_Struct* filter){
Filter0(FilterOOC); Filter0(FilterOOC);
Filter0(FilterBadWords); Filter0(FilterBadWords);
if(filter->filters[FilterPCSpells] == 0) if (filter->filters[FilterPCSpells] == 0) {
ClientFilters[FilterPCSpells] = FilterShow; SetFilter(FilterPCSpells, FilterShow);
else if(filter->filters[FilterPCSpells] == 1) } else if (filter->filters[FilterPCSpells] == 1) {
ClientFilters[FilterPCSpells] = FilterHide; SetFilter(FilterPCSpells, FilterHide);
else } else {
ClientFilters[FilterPCSpells] = FilterShowGroupOnly; SetFilter(FilterPCSpells, FilterShowGroupOnly);
}
Filter1(FilterNPCSpells); Filter1(FilterNPCSpells);
if(filter->filters[FilterBardSongs] == 0) if (filter->filters[FilterBardSongs] == 0) {
ClientFilters[FilterBardSongs] = FilterShow; SetFilter(FilterBardSongs, FilterShow);
else if(filter->filters[FilterBardSongs] == 1) } else if (filter->filters[FilterBardSongs] == 1) {
ClientFilters[FilterBardSongs] = FilterShowSelfOnly; SetFilter(FilterBardSongs, FilterShowSelfOnly);
else if(filter->filters[FilterBardSongs] == 2) } else if (filter->filters[FilterBardSongs] == 2) {
ClientFilters[FilterBardSongs] = FilterShowGroupOnly; SetFilter(FilterBardSongs, FilterShowGroupOnly);
else } else {
ClientFilters[FilterBardSongs] = FilterHide; SetFilter(FilterBardSongs, FilterHide);
}
if(filter->filters[FilterSpellCrits] == 0) if (filter->filters[FilterSpellCrits] == 0) {
ClientFilters[FilterSpellCrits] = FilterShow; SetFilter(FilterSpellCrits, FilterShow);
else if(filter->filters[FilterSpellCrits] == 1) } else if (filter->filters[FilterSpellCrits] == 1) {
ClientFilters[FilterSpellCrits] = FilterShowSelfOnly; SetFilter(FilterSpellCrits, FilterShowSelfOnly);
else } else {
ClientFilters[FilterSpellCrits] = FilterHide; SetFilter(FilterSpellCrits, FilterHide);
}
if (filter->filters[FilterMeleeCrits] == 0) if (filter->filters[FilterMeleeCrits] == 0) {
ClientFilters[FilterMeleeCrits] = FilterShow; SetFilter(FilterMeleeCrits, FilterShow);
else if (filter->filters[FilterMeleeCrits] == 1) } else if (filter->filters[FilterMeleeCrits] == 1) {
ClientFilters[FilterMeleeCrits] = FilterShowSelfOnly; SetFilter(FilterMeleeCrits, FilterShowSelfOnly);
else } else {
ClientFilters[FilterMeleeCrits] = FilterHide; SetFilter(FilterMeleeCrits, FilterHide);
}
if(filter->filters[FilterSpellDamage] == 0) if (filter->filters[FilterSpellDamage] == 0) {
ClientFilters[FilterSpellDamage] = FilterShow; SetFilter(FilterSpellDamage, FilterShow);
else if(filter->filters[FilterSpellDamage] == 1) } else if (filter->filters[FilterSpellDamage] == 1) {
ClientFilters[FilterSpellDamage] = FilterShowSelfOnly; SetFilter(FilterSpellDamage, FilterShowSelfOnly);
else } else {
ClientFilters[FilterSpellDamage] = FilterHide; SetFilter(FilterSpellDamage, FilterHide);
}
Filter0(FilterMyMisses); Filter0(FilterMyMisses);
Filter0(FilterOthersMiss); Filter0(FilterOthersMiss);
@ -3158,19 +3164,21 @@ void Client::ServerFilter(SetServerFilter_Struct* filter){
Filter1(FilterDamageShields); Filter1(FilterDamageShields);
if (ClientVersionBit() & EQ::versions::maskSoDAndLater) { if (ClientVersionBit() & EQ::versions::maskSoDAndLater) {
if (filter->filters[FilterDOT] == 0) if (filter->filters[FilterDOT] == 0) {
ClientFilters[FilterDOT] = FilterShow; SetFilter(FilterDOT, FilterShow);
else if (filter->filters[FilterDOT] == 1) } else if (filter->filters[FilterDOT] == 1) {
ClientFilters[FilterDOT] = FilterShowSelfOnly; SetFilter(FilterDOT, FilterShowSelfOnly);
else if (filter->filters[FilterDOT] == 2) } else if (filter->filters[FilterDOT] == 2) {
ClientFilters[FilterDOT] = FilterShowGroupOnly; SetFilter(FilterDOT, FilterShowGroupOnly);
else } else {
ClientFilters[FilterDOT] = FilterHide; SetFilter(FilterDOT, FilterHide);
}
} else { } else {
if (filter->filters[FilterDOT] == 0) // show functions as self only if (filter->filters[FilterDOT] == 0) { // show functions as self only
ClientFilters[FilterDOT] = FilterShowSelfOnly; SetFilter(FilterDOT, FilterShowSelfOnly);
else } else {
ClientFilters[FilterDOT] = FilterHide; SetFilter(FilterDOT, FilterHide);
}
} }
Filter1(FilterPetHits); Filter1(FilterPetHits);
@ -3179,15 +3187,14 @@ void Client::ServerFilter(SetServerFilter_Struct* filter){
Filter1(FilterPetSpells); Filter1(FilterPetSpells);
if (ClientVersionBit() & EQ::versions::maskSoDAndLater) { if (ClientVersionBit() & EQ::versions::maskSoDAndLater) {
if (filter->filters[FilterHealOverTime] == 0) if (filter->filters[FilterHealOverTime] == 0) {
ClientFilters[FilterHealOverTime] = FilterShow; SetFilter(FilterHealOverTime, FilterShow);
// This is called 'Show Mine Only' in the clients } else if (filter->filters[FilterHealOverTime] == 1) {
else if (filter->filters[FilterHealOverTime] == 1) SetFilter(FilterHealOverTime, FilterShowSelfOnly);
ClientFilters[FilterHealOverTime] = FilterShowSelfOnly; } else {
else SetFilter(FilterHealOverTime, FilterHide);
ClientFilters[FilterHealOverTime] = FilterHide; }
} else { } else { // these clients don't have a 'self only' filter
// these clients don't have a 'self only' filter
Filter1(FilterHealOverTime); Filter1(FilterHealOverTime);
} }
} }

2
zone/client.h
View File

@ -985,7 +985,7 @@ public:
inline bool IsTrader() const { return(Trader); } inline bool IsTrader() const { return(Trader); }
inline bool IsBuyer() const { return(Buyer); } inline bool IsBuyer() const { return(Buyer); }
eqFilterMode GetFilter(eqFilterType filter_id) const { return ClientFilters[filter_id]; } eqFilterMode GetFilter(eqFilterType filter_id) const { return ClientFilters[filter_id]; }
void SetFilter(eqFilterType filter_id, eqFilterMode value) { ClientFilters[filter_id]=value; } void SetFilter(eqFilterType filter_id, eqFilterMode filter_mode) { ClientFilters[filter_id] = filter_mode; }
void CancelSneakHide(); void CancelSneakHide();
void BreakInvis(); void BreakInvis();