From 4579f9f388f836e0d7204d9140b612d92669ee02 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Thu, 1 Jan 2015 12:53:23 +1100 Subject: [PATCH] Don't code while drunk; it never ends well --- server/server_character_methods.cpp | 12 ++++++------ server/server_methods.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/server_character_methods.cpp b/server/server_character_methods.cpp index dbdb903..26c4bb8 100644 --- a/server/server_character_methods.cpp +++ b/server/server_character_methods.cpp @@ -46,7 +46,7 @@ void ServerApplication::HandleCharacterCreate(CharacterPacket* const argPacket) } //push this character to the rooms - roomMgr.PushEntity(characterMgr.Get(characterIndex)); + roomMgr.PushEntity(static_cast(characterMgr.Get(characterIndex))); //pump this character to all clients CharacterPacket newPacket; @@ -90,7 +90,7 @@ void ServerApplication::HandleCharacterDelete(CharacterPacket* const argPacket) } //delete the character - roomMgr.PopEntity(characterMgr.Get(characterIndex)); + roomMgr.PopEntity(static_cast(characterMgr.Get(characterIndex))); characterMgr.Delete(characterIndex); //pump character delete @@ -124,7 +124,7 @@ void ServerApplication::HandleCharacterLoad(CharacterPacket* const argPacket) { } //push this character to the rooms - roomMgr.PushEntity(characterMgr.Get(characterIndex)); + roomMgr.PushEntity(static_cast(characterMgr.Get(characterIndex))); //pump this character to all clients CharacterPacket newPacket; @@ -157,7 +157,7 @@ void ServerApplication::HandleCharacterUnload(CharacterPacket* const argPacket) } //unload the character - roomMgr.PopEntity(characterData); + roomMgr.PopEntity(static_cast(characterData)); characterMgr.Unload(argPacket->characterIndex); //pump character delete @@ -199,7 +199,7 @@ void ServerApplication::HandleCharacterSetRoom(CharacterPacket* const argPacket) } //pop from the rooms - roomMgr.PopEntity(characterData); + roomMgr.PopEntity(static_cast(characterData)); //set the character's room, zero it's origin, zero it's motion characterData->SetRoomIndex(argPacket->roomIndex); @@ -207,7 +207,7 @@ void ServerApplication::HandleCharacterSetRoom(CharacterPacket* const argPacket) characterData->SetMotion({0, 0}); //push to the rooms - roomMgr.PushEntity(characterData); + roomMgr.PushEntity(static_cast(characterData)); //update the clients CharacterPacket newPacket; diff --git a/server/server_methods.cpp b/server/server_methods.cpp index bb147c2..6cdc600 100644 --- a/server/server_methods.cpp +++ b/server/server_methods.cpp @@ -150,7 +150,7 @@ void ServerApplication::FullCharacterUnload(int index) { } //pop from the rooms - roomMgr.PopEntity(&character.second); + roomMgr.PopEntity(static_cast(&character.second)); //pump character unload CharacterPacket newPacket;