Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-05-23 15:22:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fully define guidl ranks

Browse Source 
more testing with the guild list
This commit is contained in:
Aaron Kimbre 2023-11-23 06:48:55 -06:00
parent a4bf11502f
commit 4722c1fdea
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dChatServer/ChatPacketHandler.cpp
View File

@ -724,21 +724,32 @@ void ChatPacketHandler::HandleGuildGetAll(Packet* packet){
bitStream.Write<uint32_t>(69); bitStream.Write<uint32_t>(69);
bitStream.Write<uint32_t>(0); bitStream.Write<uint32_t>(0);
bitStream.Write<uint32_t>(1); bitStream.Write<uint32_t>(1);
bitStream.Write<uint8_t>(0); bitStream.Write<unsigned short>(0);
bitStream.Write<uint8_t>(members.size()); bitStream.Write<unsigned short>(2); // Size
//Member data //Member data
bitStream.Write1(); bitStream.Write1();
bitStream.Write1(); bitStream.Write1();
bitStream.Write<uint16_t>(1200); bitStream.Write<uint16_t>(1200);
bitStream.Write<uint16_t>(1); bitStream.Write<uint16_t>(1);
bitStream.Write<uint16_t>(1); bitStream.Write<uint32_t>(1);
bitStream.Write<uint32_t>(1);
bitStream.Write<unsigned short>(1);
bitStream.Write(LUWString(player->playerName, 25));
bitStream.Write<wchar_t>(0); //???
bitStream.Write0();
bitStream.Write0();
bitStream.Write<uint16_t>(1200);
bitStream.Write<uint16_t>(1); bitStream.Write<uint16_t>(1);
bitStream.Write<uint32_t>(1); bitStream.Write<uint32_t>(1);
bitStream.Write<uint32_t>(1);
bitStream.Write<unsigned short>(1);
bitStream.Write(LUWString(player->playerName, 25)); bitStream.Write(LUWString(player->playerName, 25));
bitStream.Write<uint8_t>(0); //??? bitStream.Write<wchar_t>(0); //???
SystemAddress sysAddr = packet->systemAddress; SystemAddress sysAddr = packet->systemAddress;
SEND_PACKET; SEND_PACKET;
LOG("Send GUILD DATA");
} }
void ChatPacketHandler::SendTeamInvite(PlayerData* receiver, PlayerData* sender) { void ChatPacketHandler::SendTeamInvite(PlayerData* receiver, PlayerData* sender) {

8
dCommon/dEnums/eGuildRank.h
View File

@ -5,10 +5,10 @@
enum eGuildRank { enum eGuildRank {
FOUNDER = 1, LEADER = 1,
RANK2, OFFICER,
RANK3, VETERAN,
MEMBER RECRUIT
}; };
#endif //!__EGUILDRANK__H__ #endif //!__EGUILDRANK__H__

2
dNet/ClientPackets.cpp
View File

@ -439,7 +439,7 @@ void ClientPackets::HandleGuildCreation(Packet* packet) {
return; return;
} }
Database::Get()->InsertGuildMember(newGuild->id, character->GetID(), eGuildRank::FOUNDER); Database::Get()->InsertGuildMember(newGuild->id, character->GetID(), eGuildRank::LEADER);
characterComp->SetGuild(newGuild->id, guildName.string); characterComp->SetGuild(newGuild->id, guildName.string);
SendGuildCreateResponse(packet->systemAddress, eGuildCreationResponse::CREATED, newGuild->id, guildName.string); SendGuildCreateResponse(packet->systemAddress, eGuildCreationResponse::CREATED, newGuild->id, guildName.string);