Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Cleanup] Cleaning up Raid.cpp #3125

Merged
merged 8 commits into from Mar 20, 2023
Merged

[Cleanup] Cleaning up Raid.cpp #3125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c8534bf
[Cleanup] Cleanup Raid.cpp
Aeadoin Mar 18, 2023
aa80cca
cleanup
Aeadoin Mar 18, 2023
7867c5c
fix is_bot instances
Aeadoin Mar 19, 2023
8777913
bracket cleanup
Aeadoin Mar 19, 2023
daadc13
bracket cleanup
Aeadoin Mar 19, 2023
3d05796
rename variables in struct
Aeadoin Mar 19, 2023
1c2cd15
Merge branch 'master' into raidfixes
Aeadoin Mar 19, 2023
54b6194
fix for merge
Aeadoin Mar 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions common/patches/rof.cpp
View file
Open in desktop
Expand Up @@ -1050,7 +1050,7 @@ namespace RoF
{
if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
{
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);

auto outapp =
new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
Expand All @@ -1069,7 +1069,7 @@ namespace RoF
return;
}
//if(gjs->action == groupActLeave)
// Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
// Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);

auto outapp =
new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
Expand Down Expand Up @@ -1099,7 +1099,7 @@ namespace RoF

for (int i = 0; i < 5; ++i)
{
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i, gu2->membername[i]);
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i, gu2->member_name[i]);
if (gu2->membername[i][0] != '\0')
{
PacketLength += (22 + strlen(gu2->membername[i]) + 1);
Expand Down Expand Up @@ -1169,7 +1169,7 @@ namespace RoF
return;

}
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
ENCODE_LENGTH_EXACT(GroupJoin_Struct);
SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);

Expand Down
8 changes: 4 additions & 4 deletions common/patches/rof2.cpp
View file
Open in desktop
Expand Up @@ -1101,7 +1101,7 @@ namespace RoF2
{
if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
{
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);

auto outapp =
new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
Expand All @@ -1120,7 +1120,7 @@ namespace RoF2
return;
}
//if(gjs->action == groupActLeave)
// Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
// Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);

auto outapp =
new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
Expand Down Expand Up @@ -1150,7 +1150,7 @@ namespace RoF2

for (int i = 0; i < 5; ++i)
{
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i, gu2->membername[i]);
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i, gu2->member_name[i]);
if (gu2->membername[i][0] != '\0')
{
PacketLength += (22 + strlen(gu2->membername[i]) + 1);
Expand Down Expand Up @@ -1220,7 +1220,7 @@ namespace RoF2
return;

}
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
ENCODE_LENGTH_EXACT(GroupJoin_Struct);
SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);

Expand Down
4 changes: 2 additions & 2 deletions common/patches/rof2_structs.h
View file
Open in desktop
Expand Up @@ -2590,7 +2590,7 @@ struct GroupUpdate_Struct_Live { // New for Live

struct GroupMembers_Struct { // New for Live
/*0000*/ uint32 membernumber; // Guess - number of member in the group (0 to 5?)
/*0000*/ //char membername[0]; // Member Name Null Terminated
/*0000*/ //char member_name[0]; // Member Name Null Terminated
/*0000*/ uint8 unknown001[3]; // Seen 0
/*0000*/ uint32 memberlevel; // Guess
/*0000*/ uint8 unknown002[11]; // Seen 0
Expand All @@ -2600,7 +2600,7 @@ struct GroupJoin_Struct_Live { // New for Live
/*0000*/ uint32 unknown0000; // Matches unknown0136 from GroupFollow_Struct
/*0004*/ uint32 action;
/*0008*/ uint8 unknown0008[5]; // Seen 0
/*0013*/ //char membername[0]; // Null Terminated?
/*0013*/ //char member_name[0]; // Null Terminated?
/*0000*/ uint8 unknown0013[3]; // Seen 0
/*0000*/ uint32 unknown0016; // Matches unknown0132 from GroupFollow_Struct
/*0000*/ uint8 unknown0020[11]; // Seen 0
Expand Down
4 changes: 2 additions & 2 deletions common/patches/rof_structs.h
View file
Open in desktop
Expand Up @@ -2566,7 +2566,7 @@ struct GroupUpdate_Struct_Live { // New for Live

struct GroupMembers_Struct { // New for Live
/*0000*/ uint32 membernumber; // Guess - number of member in the group (0 to 5?)
/*0000*/ //char membername[0]; // Member Name Null Terminated
/*0000*/ //char member_name[0]; // Member Name Null Terminated
/*0000*/ uint8 unknown001[3]; // Seen 0
/*0000*/ uint32 memberlevel; // Guess
/*0000*/ uint8 unknown002[11]; // Seen 0
Expand All @@ -2576,7 +2576,7 @@ struct GroupJoin_Struct_Live { // New for Live
/*0000*/ uint32 unknown0000; // Matches unknown0136 from GroupFollow_Struct
/*0004*/ uint32 action;
/*0008*/ uint8 unknown0008[5]; // Seen 0
/*0013*/ //char membername[0]; // Null Terminated?
/*0013*/ //char member_name[0]; // Null Terminated?
/*0000*/ uint8 unknown0013[3]; // Seen 0
/*0000*/ uint32 unknown0016; // Matches unknown0132 from GroupFollow_Struct
/*0000*/ uint8 unknown0020[11]; // Seen 0
Expand Down
8 changes: 4 additions & 4 deletions common/patches/sod.cpp
View file
Open in desktop
Expand Up @@ -785,7 +785,7 @@ namespace SoD
{
if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
{
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);

auto outapp =
new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
Expand All @@ -804,7 +804,7 @@ namespace SoD
return;
}
//if(gjs->action == groupActLeave)
// Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
// Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);

auto outapp =
new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
Expand Down Expand Up @@ -834,7 +834,7 @@ namespace SoD

for (int i = 0; i < 5; ++i)
{
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i, gu2->membername[i]);
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i, gu2->member_name[i]);
if (gu2->membername[i][0] != '\0')
{
PacketLength += (22 + strlen(gu2->membername[i]) + 1);
Expand Down Expand Up @@ -902,7 +902,7 @@ namespace SoD
return;
}

//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
ENCODE_LENGTH_EXACT(GroupJoin_Struct);
SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);

Expand Down
4 changes: 2 additions & 2 deletions common/patches/sod_structs.h
View file
Open in desktop
Expand Up @@ -2085,7 +2085,7 @@ struct GroupUpdate_Struct_SoD { // New for SoD

struct GroupMembers_Struct { // New for SoD
/*0000*/ uint32 membernumber; // Guess - number of member in the group (0 to 5?)
/*0000*/ //char membername[0]; // Member Name Null Terminated
/*0000*/ //char member_name[0]; // Member Name Null Terminated
/*0000*/ uint8 unknown001[3]; // Seen 0
/*0000*/ uint32 memberlevel; // Guess
/*0000*/ uint8 unknown002[11]; // Seen 0
Expand All @@ -2095,7 +2095,7 @@ struct GroupJoin_Struct_SoD { // New for SoD
/*0000*/ uint32 unknown0000; // Matches unknown0136 from GroupFollow_Struct
/*0004*/ uint32 action;
/*0008*/ uint8 unknown0008[5]; // Seen 0
/*0013*/ //char membername[0]; // Null Terminated?
/*0013*/ //char member_name[0]; // Null Terminated?
/*0000*/ uint8 unknown0013[3]; // Seen 0
/*0000*/ uint32 unknown0016; // Matches unknown0132 from GroupFollow_Struct
/*0000*/ uint8 unknown0020[11]; // Seen 0
Expand Down
8 changes: 4 additions & 4 deletions common/patches/uf.cpp
View file
Open in desktop
Expand Up @@ -927,7 +927,7 @@ namespace UF
{
if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
{
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);

auto outapp =
new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
Expand All @@ -947,7 +947,7 @@ namespace UF
return;
}
//if(gjs->action == groupActLeave)
// Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
// Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);

auto outapp =
new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
Expand Down Expand Up @@ -977,7 +977,7 @@ namespace UF

for (int i = 0; i < 5; ++i)
{
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i, gu2->membername[i]);
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i, gu2->member_name[i]);
if (gu2->membername[i][0] != '\0')
{
PacketLength += (22 + strlen(gu2->membername[i]) + 1);
Expand Down Expand Up @@ -1045,7 +1045,7 @@ namespace UF
delete in;
return;
}
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
ENCODE_LENGTH_EXACT(GroupJoin_Struct);
SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);

Expand Down
4 changes: 2 additions & 2 deletions common/patches/uf_structs.h
View file
Open in desktop
Expand Up @@ -2128,7 +2128,7 @@ struct GroupUpdate_Struct_Underfoot { // New for Underfoot

struct GroupMembers_Struct { // New for Underfoot
/*0000*/ uint32 membernumber; // Guess - number of member in the group (0 to 5?)
/*0000*/ //char membername[0]; // Member Name Null Terminated
/*0000*/ //char member_name[0]; // Member Name Null Terminated
/*0000*/ uint8 unknown001[3]; // Seen 0
/*0000*/ uint32 memberlevel; // Guess
/*0000*/ uint8 unknown002[11]; // Seen 0
Expand All @@ -2138,7 +2138,7 @@ struct GroupJoin_Struct_Underfoot { // New for Underfoot
/*0000*/ uint32 unknown0000; // Matches unknown0136 from GroupFollow_Struct
/*0004*/ uint32 action;
/*0008*/ uint8 unknown0008[5]; // Seen 0
/*0013*/ //char membername[0]; // Null Terminated?
/*0013*/ //char member_name[0]; // Null Terminated?
/*0000*/ uint8 unknown0013[3]; // Seen 0
/*0000*/ uint32 unknown0016; // Matches unknown0132 from GroupFollow_Struct
/*0000*/ uint8 unknown0020[11]; // Seen 0
Expand Down
6 changes: 4 additions & 2 deletions ucs/chatchannel.cpp
View file
Open in desktop
Expand Up @@ -393,13 +393,15 @@ bool ChatChannel::RemoveClient(Client *c) {

void ChatChannel::SendOPList(Client *c)
{
if (!c)
if (!c) {
return;
}

c->GeneralChannelMessage("Channel " + m_name + " op-list: (Owner=" + m_owner + ")");

for (auto &&m : m_moderators)
for (auto &&m : m_moderators) {
c->GeneralChannelMessage(m);
}
}

void ChatChannel::SendChannelMembers(Client *c) {
Expand Down
4 changes: 3 additions & 1 deletion ucs/clientlist.cpp
View file
Open in desktop
Expand Up @@ -571,7 +571,9 @@ void Clientlist::CheckForStaleConnectionsAll()

void Clientlist::CheckForStaleConnections(Client *c) {

if (!c) return;
if (!c) {
return;
}

std::list<Client*>::iterator Iterator;

Expand Down
3 changes: 1 addition & 2 deletions ucs/worldserver.cpp
View file
Open in desktop
Expand Up @@ -120,8 +120,7 @@ void WorldServer::ProcessMessage(uint16 opcode, EQ::Net::Packet &p)
if (Message.length() < 2)
break;

if (!c)
{
if (!c) {
LogInfo("Client not found");
break;
}
Expand Down
12 changes: 6 additions & 6 deletions world/cliententry.cpp
View file
Open in desktop
Expand Up @@ -120,9 +120,9 @@ ClientListEntry::~ClientListEntry()
Camp(); // updates zoneserver's numplayers
client_list.RemoveCLEReferances(this);
}
for (auto& elem: tell_queue) {
safe_delete_array(elem)
};
for (auto& elem : tell_queue) {
safe_delete_array(elem);
}
tell_queue.clear();
}

Expand Down Expand Up @@ -283,9 +283,9 @@ void ClientListEntry::ClearVars(bool iAll)
pLFG = 0;
gm = 0;
pClientVersion = 0;
for (auto& elem: tell_queue) {
safe_delete_array(elem)
};
for (auto& elem : tell_queue) {
safe_delete_array(elem);
}
tell_queue.clear();
}

Expand Down
11 changes: 5 additions & 6 deletions zone/attack.cpp
View file
Open in desktop
Expand Up @@ -2746,23 +2746,23 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy
switch (r->GetLootType()) {
case 0:
case 1:
if (r->members[x].member && r->members[x].IsRaidLeader) {
if (r->members[x].member && r->members[x].is_raid_leader) {
corpse->AllowPlayerLoot(r->members[x].member, i);
i++;
}
break;
case 2:
if (r->members[x].member && r->members[x].IsRaidLeader) {
if (r->members[x].member && r->members[x].is_raid_leader) {
corpse->AllowPlayerLoot(r->members[x].member, i);
i++;
}
else if (r->members[x].member && r->members[x].IsGroupLeader) {
else if (r->members[x].member && r->members[x].is_group_leader) {
corpse->AllowPlayerLoot(r->members[x].member, i);
i++;
}
break;
case 3:
if (r->members[x].member && r->members[x].IsLooter) {
if (r->members[x].member && r->members[x].is_looter) {
corpse->AllowPlayerLoot(r->members[x].member, i);
i++;
}
Expand Down Expand Up @@ -4395,8 +4395,7 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons
);
}
}

} //end packet sending
}

void Mob::HealDamage(uint64 amount, Mob* caster, uint16 spell_id)
{
Expand Down
22 changes: 11 additions & 11 deletions zone/aura.cpp
View file
Open in desktop
Expand Up @@ -144,8 +144,8 @@ void Aura::ProcessOnAllGroupMembers(Mob *owner)
if (c->GetID() == m_owner) {
return DistanceSquared(GetPosition(), c->GetPosition()) <= distance;
}
else if (idx == 0xFFFFFFFF || raid->members[idx].GroupNumber != group_id ||
raid->members[idx].GroupNumber == 0xFFFFFFFF) {
else if (idx == 0xFFFFFFFF || raid->members[idx].group_number != group_id ||
raid->members[idx].group_number == 0xFFFFFFFF) {
return false;
}
else if (DistanceSquared(GetPosition(), c->GetPosition()) > distance) {
Expand All @@ -159,8 +159,8 @@ void Aura::ProcessOnAllGroupMembers(Mob *owner)
if (m->GetOwner()->GetID() == m_owner) {
return DistanceSquared(GetPosition(), m->GetPosition()) <= distance;
}
else if (idx == 0xFFFFFFFF || raid->members[idx].GroupNumber != group_id ||
raid->members[idx].GroupNumber == 0xFFFFFFFF) {
else if (idx == 0xFFFFFFFF || raid->members[idx].group_number != group_id ||
raid->members[idx].group_number == 0xFFFFFFFF) {
return false;
}
else if (DistanceSquared(GetPosition(), m->GetPosition()) > distance) {
Expand All @@ -178,8 +178,8 @@ void Aura::ProcessOnAllGroupMembers(Mob *owner)
if (owner->GetID() == m_owner) {
return DistanceSquared(GetPosition(), n->GetPosition()) <= distance;
}
else if (idx == 0xFFFFFFFF || raid->members[idx].GroupNumber != group_id ||
raid->members[idx].GroupNumber == 0xFFFFFFFF) {
else if (idx == 0xFFFFFFFF || raid->members[idx].group_number != group_id ||
raid->members[idx].group_number == 0xFFFFFFFF) {
return false;
}
else if (DistanceSquared(GetPosition(), n->GetPosition()) > distance) {
Expand Down Expand Up @@ -389,8 +389,8 @@ void Aura::ProcessOnGroupMembersPets(Mob *owner)
if (m->GetOwner()->GetID() == group_member->GetID()) {
return DistanceSquared(GetPosition(), m->GetPosition()) <= distance;
}
else if (idx == 0xFFFFFFFF || raid->members[idx].GroupNumber != group_id ||
raid->members[idx].GroupNumber == 0xFFFFFFFF) {
else if (idx == 0xFFFFFFFF || raid->members[idx].group_number != group_id ||
raid->members[idx].group_number == 0xFFFFFFFF) {
return false;
}
else if (DistanceSquared(GetPosition(), m->GetPosition()) > distance) {
Expand All @@ -408,8 +408,8 @@ void Aura::ProcessOnGroupMembersPets(Mob *owner)
if (owner->GetID() == group_member->GetID()) {
return DistanceSquared(GetPosition(), n->GetPosition()) <= distance;
}
else if (idx == 0xFFFFFFFF || raid->members[idx].GroupNumber != group_id ||
raid->members[idx].GroupNumber == 0xFFFFFFFF) {
else if (idx == 0xFFFFFFFF || raid->members[idx].group_number != group_id ||
raid->members[idx].group_number == 0xFFFFFFFF) {
return false;
}
else if (DistanceSquared(GetPosition(), n->GetPosition()) > distance) {
Expand Down Expand Up @@ -819,7 +819,7 @@ bool Aura::ShouldISpawnFor(Client *c)
return false;
}

if (raid->members[idx].GroupNumber != group_id) { // in our raid, but not our group
if (raid->members[idx].group_number != group_id) { // in our raid, but not our group
return false;
}

Expand Down