pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-02 04:16:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Shared Tasks] Cleanup shared task request and remove (#2341)

Browse Source 
Functionally nothing should change in this patch. This refactors a lot
of formatting and code duplication in requests and member removals.

The long SharedTaskMessage namespace and its constants were contributing
to a lot of formatting that was difficult to read. These were shortened
since they're not all shared task specific anyway (though they should
probably just be moved to string_ids.h with other eqstrs now)

Shared task requests were refactored a little to remove an unnecessary
function that filled potential members. The separate functions used for
/taskquit and /taskremove were also combined into a single function to
remove a member while preserving live message differences.
This commit is contained in:
hg
2022-07-30 21:36:04 -04:00
committed by GitHub
parent 8a962e09f6
commit d243cbf8a3
12 changed files with 220 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/shared_tasks.h
+8 -7
View File
@@ -16,7 +16,7 @@
#define ServerOP_SharedTaskAddPlayer 0x0301 // bidirectional. /taskaddplayer request zone -> world. success world -> zone
#define ServerOP_SharedTaskMakeLeader 0x0302 // zone -> world -> zone
#define ServerOP_SharedTaskRemovePlayer 0x0303 // zone -> world -> zone
#define ServerOP_SharedTaskAttemptRemove 0x0304 // zone -> world. Player trying to delete task
#define ServerOP_SharedTaskQuit 0x0304 // zone -> world. Player trying to delete task
#define ServerOP_SharedTaskUpdate 0x0305 // zone -> world. Client sending task update to world. Relayed world -> zone on confirmation
#define ServerOP_SharedTaskMemberlist 0x0306 // world -> zone. Send shared task memberlist
#define ServerOP_SharedTaskRequestMemberlist 0x0307 // zone -> world. Send shared task memberlist (zone in initial for now, could change)
@@ -55,11 +55,11 @@ struct ServerSharedTaskInvitePlayer_Struct {
char inviter_name[64];
};
// ServerOP_SharedTaskAttemptRemove
// ServerOP_SharedTaskQuit
// gets re-used when sent back to clients
struct ServerSharedTaskAttemptRemove_Struct {
struct ServerSharedTaskQuit_Struct {
uint32 requested_character_id;
uint32 requested_task_id;
uint32 task_id;
bool remove_from_db;
};
@@ -77,12 +77,13 @@ struct SharedTaskMember {
};
// used in shared task requests to validate group/raid members
struct SharedTaskRequestCharacters {
struct SharedTaskRequest {
int lowest_level;
int highest_level;
uint32_t leader_id;
SharedTaskRequestGroupType group_type;
std::vector<uint32_t> character_ids;
std::vector<CharacterDataRepository::CharacterData> characters;
std::vector<SharedTaskMember> members;
};
// ServerOP_SharedTaskMemberlist
@@ -174,7 +175,7 @@ struct ServerSharedTaskLock_Struct {
class SharedTask {
public:
// used in both zone and world validation
static SharedTaskRequestCharacters GetRequestCharacters(Database& db, uint32_t requested_character_id);
static SharedTaskRequest GetRequestCharacters(Database& db, uint32_t requested_character_id);
void AddCharacterToMemberHistory(uint32_t character_id);
SharedTaskMember FindMemberFromCharacterID(uint32_t character_id) const;