Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added a room check to the character query

Browse Source
This commit is contained in:
Kayne Ruse
2014-12-27 01:33:10 +11:00
parent 3e2d1a5a56
commit 398f1c8bfd
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/scenes/in_world.cpp
+1
View File
@@ -579,6 +579,7 @@ void InWorld::HandleCharacterSetRoom(CharacterPacket* const argPacket) {
//request the info on characters in this room //request the info on characters in this room
CharacterPacket newPacket; CharacterPacket newPacket;
newPacket.type = SerialPacketType::QUERY_CHARACTER_EXISTS; newPacket.type = SerialPacketType::QUERY_CHARACTER_EXISTS;
newPacket.roomIndex = roomIndex;
network.SendTo(Channels::SERVER, &newPacket); network.SendTo(Channels::SERVER, &newPacket);
} }
server/server_data.cpp
+4 -1
View File
@@ -73,9 +73,12 @@ void ServerApplication::HandleRegionRequest(RegionPacket* const argPacket) {
void ServerApplication::HandleCharacterExists(CharacterPacket* const argPacket) { void ServerApplication::HandleCharacterExists(CharacterPacket* const argPacket) {
//respond with all character data //respond with all character data
//TODO: handle room and location specifications
CharacterPacket newPacket; CharacterPacket newPacket;
for (auto& it : *characterMgr.GetContainer()) { for (auto& it : *characterMgr.GetContainer()) {
if (argPacket->roomIndex != -1 && it.second.GetRoomIndex() != argPacket->roomIndex) {
continue;
}
CopyCharacterToPacket(&newPacket, it.first); CopyCharacterToPacket(&newPacket, it.first);
newPacket.type = SerialPacketType::QUERY_CHARACTER_EXISTS; newPacket.type = SerialPacketType::QUERY_CHARACTER_EXISTS;
network.SendTo(argPacket->srcAddress, static_cast<SerialPacket*>(&newPacket)); network.SendTo(argPacket->srcAddress, static_cast<SerialPacket*>(&newPacket));