Brought client into line with server

Also added a new config file for developing over multiple machines.
This commit is contained in:
2016-03-21 22:06:25 +11:00
parent b89f6f2ece
commit 30aa11c083
10 changed files with 110 additions and 153 deletions
+8 -3
View File
@@ -136,6 +136,7 @@ void ServerApplication::Init(int argc, char* argv[]) {
std::cout << "Internal sizes:" << std::endl;
DEBUG_INTERNAL_VAR(config["server.name"]);
DEBUG_INTERNAL_VAR(NETWORK_VERSION);
DEBUG_INTERNAL_VAR(sizeof(Region::type_t));
DEBUG_INTERNAL_VAR(sizeof(Region));
@@ -303,6 +304,10 @@ void ServerApplication::HandlePacket(SerialPacket* const argPacket) {
hCharacterMovement(static_cast<CharacterPacket*>(argPacket));
break;
case SerialPacketType::QUERY_CREATURE_EXISTS:
//TODO: creature queries
break;
//chat
case SerialPacketType::TEXT_BROADCAST:
hTextBroadcast(static_cast<TextPacket*>(argPacket));
@@ -656,9 +661,9 @@ void ServerApplication::hCharacterDelete(CharacterPacket* const argPacket) {
CharacterData* characterData = characterMgr.Get(characterIndex);
roomMgr.PopCharacter(characterData);
//pump character delete
//pump character unload
CharacterPacket newPacket;
newPacket.type = SerialPacketType::CHARACTER_DELETE;
newPacket.type = SerialPacketType::CHARACTER_UNLOAD;
newPacket.characterIndex = characterIndex;
pumpPacketProximity(static_cast<SerialPacket*>(&newPacket), characterData->GetRoomIndex());
@@ -728,7 +733,7 @@ void ServerApplication::hCharacterUnload(CharacterPacket* const argPacket) {
//pump character delete
CharacterPacket newPacket;
newPacket.type = SerialPacketType::CHARACTER_DELETE;
newPacket.type = SerialPacketType::CHARACTER_UNLOAD;
newPacket.characterIndex = argPacket->characterIndex;
pumpPacketProximity(static_cast<SerialPacket*>(&newPacket), characterData->GetRoomIndex());