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

[Guilds] Clean up GUILD_RANK_NONE references (#4059)

Browse Source 
Should be exhaustive for guild rank values
Cleans up redefinition of `GUILD_RANK_NONE` by including `GUILD_RANK_NONE_TI`
Fixes #4057
This commit is contained in:
JJ 2024-02-11 11:58:19 -05:00 committed by GitHub
parent a27a8adf1e
commit 3e6924d10e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/guild_base.cpp
View File

@ -881,7 +881,7 @@ static void ProcessGuildMember(MySQLRequestRow row, CharGuildInfo &into)
if (into.guild_id == 0) {
into.guild_id = GUILD_NONE;
}
if (into.rank > GUILD_MAX_RANK) {
if (into.rank > GUILD_MAX_RANK + 1) {
into.rank = GUILD_RANK_NONE;
}
}

2
common/guilds.h
View File

@ -35,7 +35,7 @@
#define GUILD_MEMBER_TI 0
#define GUILD_OFFICER_TI 1
#define GUILD_LEADER_TI 2
#define GUILD_RANK_NONE (GUILD_MAX_RANK+1)
#define GUILD_RANK_NONE_TI (GUILD_MAX_RANK + 1)
//defines for standard ranks base on RoF2 definitions
#define GUILD_RANK_NONE 0

5
common/patches/titanium.cpp
View File

@ -692,6 +692,10 @@ namespace Titanium
eq->rank = GUILD_LEADER_TI;
break;
}
default: {
eq->rank = GUILD_RANK_NONE_TI;
break;
}
}
memcpy(eq->member_name, emu->member_name, sizeof(eq->member_name));
@ -1417,6 +1421,7 @@ namespace Titanium
break;
}
default: {
eq->guildrank = GUILD_RANK_NONE_TI;
break;
}
}

16
common/patches/uf.cpp
View File

@ -1155,6 +1155,7 @@ namespace UF
break;
}
default: {
emu_e->rank = GUILD_RANK_NONE_TI;
break;
}
}
@ -1256,6 +1257,10 @@ namespace UF
eq->rank_ = GUILD_LEADER_TI;
break;
}
default: {
eq->rank_ = GUILD_RANK_NONE_TI;
break;
}
}
OUT(zone_id)
OUT(last_on)
@ -1291,6 +1296,10 @@ namespace UF
eq->rank_ = GUILD_LEADER_TI;
break;
}
default: {
eq->rank_ = GUILD_RANK_NONE_TI;
break;
}
}
FINISH_ENCODE()
}
@ -1970,6 +1979,7 @@ namespace UF
break;
}
default: {
emu->guildrank = GUILD_RANK_NONE_TI;
break;
}
}
@ -2503,6 +2513,10 @@ namespace UF
eq->parameter = GUILD_LEADER_TI;
break;
}
default: {
eq->parameter = GUILD_RANK_NONE_TI;
break;
}
}
break;
}
@ -2545,6 +2559,7 @@ namespace UF
break;
}
default: {
emu->rank = GUILD_RANK_NONE_TI;
break;
}
}
@ -3163,6 +3178,7 @@ namespace UF
break;
}
default: {
emu->guildrank = GUILD_RANK_NONE_TI;
break;
}
}

8
zone/client_packet.cpp
View File

@ -8163,6 +8163,10 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
rank = GUILD_LEADER;
break;
}
default: {
rank = GUILD_RANK_NONE;
break;
}
}
}
@ -8564,6 +8568,10 @@ void Client::Handle_OP_GuildPromote(const EQApplicationPacket *app)
rank = GUILD_LEADER;
break;
}
default: {
rank = GUILD_RANK_NONE;
break;
}
}
}

1
zone/guild_mgr.cpp
View File

@ -1640,6 +1640,7 @@ uint8* ZoneGuildManager::MakeGuildMembers(uint32 guild_id, const char* prefix_na
break;
}
default: {
ci->rank = GUILD_RANK_NONE_TI;
break;
}
}