pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-26 17:52:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Cleanup] Remove unnecessary conditions in Client::SendFactionMessage() (#3267)

Browse Source 
# Notes
- `faction_value < this_faction_max` and `faction_value > this_faction_min` are always true if they get to that point in the code.
This commit is contained in:
Alex King 2023-04-05 10:27:15 -04:00 committed by GitHub
parent 8fc7f3a732
commit 2742eca119
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
zone/client.cpp
View File

@ -8002,7 +8002,7 @@ void Client::MerchantRejectMessage(Mob *merchant, int primaryfaction)
//o-------------------------------------------------------------- //o--------------------------------------------------------------
void Client::SendFactionMessage(int32 tmpvalue, int32 faction_id, int32 faction_before_hit, int32 totalvalue, uint8 temp, int32 this_faction_min, int32 this_faction_max) void Client::SendFactionMessage(int32 tmpvalue, int32 faction_id, int32 faction_before_hit, int32 totalvalue, uint8 temp, int32 this_faction_min, int32 this_faction_max)
{ {
char name[50]; char name[50];
int32 faction_value; int32 faction_value;
// If we're dropping from MAX or raising from MIN or repairing, // If we're dropping from MAX or raising from MIN or repairing,
@ -8013,30 +8013,37 @@ void Client::SendFactionMessage(int32 tmpvalue, int32 faction_id, int32 faction_
// hit. For example, if we go from 1199 to 1200 which is the MAX // hit. For example, if we go from 1199 to 1200 which is the MAX
// we still want to say faction got better this time around. // we still want to say faction got better this time around.
if ( (faction_before_hit >= this_faction_max) || if (!EQ::ValueWithin(faction_before_hit, this_faction_min, this_faction_max)) {
(faction_before_hit <= this_faction_min))
faction_value = totalvalue; faction_value = totalvalue;
else } else {
faction_value = faction_before_hit; faction_value = faction_before_hit;
}
// default to Faction# if we couldn't get the name from the ID // default to Faction# if we couldn't get the name from the ID
if (content_db.GetFactionName(faction_id, name, sizeof(name)) == false) if (!content_db.GetFactionName(faction_id, name, sizeof(name))) {
snprintf(name, sizeof(name), "Faction%i", faction_id); snprintf(name, sizeof(name), "Faction%i", faction_id);
}
if (tmpvalue == 0 || temp == 1 || temp == 2) if (tmpvalue == 0 || temp == 1 || temp == 2) {
return; return;
else if (faction_value >= this_faction_max) } else if (faction_value >= this_faction_max) {
MessageString(Chat::Yellow, FACTION_BEST, name); MessageString(Chat::Yellow, FACTION_BEST, name);
else if (faction_value <= this_faction_min) } else if (faction_value <= this_faction_min) {
MessageString(Chat::Yellow, FACTION_WORST, name); MessageString(Chat::Yellow, FACTION_WORST, name);
else if (tmpvalue > 0 && faction_value < this_faction_max && !RuleB(Client, UseLiveFactionMessage)) } else if (tmpvalue > 0 && !RuleB(Client, UseLiveFactionMessage)) {
MessageString(Chat::Yellow, FACTION_BETTER, name); MessageString(Chat::Yellow, FACTION_BETTER, name);
else if (tmpvalue < 0 && faction_value > this_faction_min && !RuleB(Client, UseLiveFactionMessage)) } else if (tmpvalue < 0 && !RuleB(Client, UseLiveFactionMessage)) {
MessageString(Chat::Yellow, FACTION_WORSE, name); MessageString(Chat::Yellow, FACTION_WORSE, name);
else if (RuleB(Client, UseLiveFactionMessage)) } else if (RuleB(Client, UseLiveFactionMessage)) {
Message(Chat::Yellow, "Your faction standing with %s has been adjusted by %i.", name, tmpvalue); //New Live faction message (14261) Message(
Chat::Yellow,
return; fmt::format(
"Your faction standing with {} has been adjusted by {}.",
name,
tmpvalue
).c_str()
);
} //New Live faction message (14261)
} }
void Client::LoadAccountFlags() void Client::LoadAccountFlags()