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

Don't code while drunk; it never ends well

Browse Source
This commit is contained in:
Kayne Ruse
2015-01-01 12:53:23 +11:00
parent b4b7c0d877
commit 4579f9f388
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/server_character_methods.cpp
+6 -6
View File
@@ -46,7 +46,7 @@ void ServerApplication::HandleCharacterCreate(CharacterPacket* const argPacket)
} }
//push this character to the rooms //push this character to the rooms
roomMgr.PushEntity(characterMgr.Get(characterIndex)); roomMgr.PushEntity(static_cast<Entity*>(characterMgr.Get(characterIndex)));
//pump this character to all clients //pump this character to all clients
CharacterPacket newPacket; CharacterPacket newPacket;
@@ -90,7 +90,7 @@ void ServerApplication::HandleCharacterDelete(CharacterPacket* const argPacket)
} }
//delete the character //delete the character
roomMgr.PopEntity(characterMgr.Get(characterIndex)); roomMgr.PopEntity(static_cast<Entity*>(characterMgr.Get(characterIndex)));
characterMgr.Delete(characterIndex); characterMgr.Delete(characterIndex);
//pump character delete //pump character delete
@@ -124,7 +124,7 @@ void ServerApplication::HandleCharacterLoad(CharacterPacket* const argPacket) {
} }
//push this character to the rooms //push this character to the rooms
roomMgr.PushEntity(characterMgr.Get(characterIndex)); roomMgr.PushEntity(static_cast<Entity*>(characterMgr.Get(characterIndex)));
//pump this character to all clients //pump this character to all clients
CharacterPacket newPacket; CharacterPacket newPacket;
@@ -157,7 +157,7 @@ void ServerApplication::HandleCharacterUnload(CharacterPacket* const argPacket)
} }
//unload the character //unload the character
roomMgr.PopEntity(characterData); roomMgr.PopEntity(static_cast<Entity*>(characterData));
characterMgr.Unload(argPacket->characterIndex); characterMgr.Unload(argPacket->characterIndex);
//pump character delete //pump character delete
@@ -199,7 +199,7 @@ void ServerApplication::HandleCharacterSetRoom(CharacterPacket* const argPacket)
} }
//pop from the rooms //pop from the rooms
roomMgr.PopEntity(characterData); roomMgr.PopEntity(static_cast<Entity*>(characterData));
//set the character's room, zero it's origin, zero it's motion //set the character's room, zero it's origin, zero it's motion
characterData->SetRoomIndex(argPacket->roomIndex); characterData->SetRoomIndex(argPacket->roomIndex);
@@ -207,7 +207,7 @@ void ServerApplication::HandleCharacterSetRoom(CharacterPacket* const argPacket)
characterData->SetMotion({0, 0}); characterData->SetMotion({0, 0});
//push to the rooms //push to the rooms
roomMgr.PushEntity(characterData); roomMgr.PushEntity(static_cast<Entity*>(characterData));
//update the clients //update the clients
CharacterPacket newPacket; CharacterPacket newPacket;
server/server_methods.cpp
+1 -1
View File
@@ -150,7 +150,7 @@ void ServerApplication::FullCharacterUnload(int index) {
} }
//pop from the rooms //pop from the rooms
roomMgr.PopEntity(&character.second); roomMgr.PopEntity(static_cast<Entity*>(&character.second));
//pump character unload //pump character unload
CharacterPacket newPacket; CharacterPacket newPacket;