Moved some utility methods out of the "god class"

These methods are are now functions in server_utilities.hpp

server/server_utilities/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=.
+INCLUDES+=. ../accounts ../characters ../clients ../entities ../monsters ../rooms ../waypoints ../../common/gameplay ../../common/map ../../common/network ../../common/network/packet_types ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

server/server_utilities/server_utilities.cpp

@@ -0,0 +1,151 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "server_utilities.hpp"
+
+#include "account_manager.hpp"
+#include "character_manager.hpp"
+#include "client_manager.hpp"
+#include "room_manager.hpp"
+#include "udp_network_utility.hpp"
+
+//-------------------------
+//manager unload functions
+//-------------------------
+
+void fullClientUnload(int index) {
+	ClientManager::GetSingleton().UnloadIf([index](std::pair<const int, ClientData const&> clientPair) -> bool {
+		//skip the wrong clients
+		if (clientPair.first != index) {
+			return false;
+		}
+
+		AccountManager& accountMgr = AccountManager::GetSingleton();
+
+		//unload associated accounts
+		for (std::map<int, AccountData>::iterator it = accountMgr.GetContainer()->begin(); it != accountMgr.GetContainer()->end(); /* EMPTY */) {
+			if (it->second.GetClientIndex() == index) {
+				fullAccountUnload(it->first);
+				it = accountMgr.GetContainer()->begin();
+			}
+			else {
+				++it;
+			}
+		}
+
+		//unload this client
+		return true;
+	});
+}
+
+void fullAccountUnload(int index) {
+	AccountManager::GetSingleton().UnloadIf([index](std::pair<const int, AccountData const&> accountPair) -> bool {
+		//skip the wrong accounts
+		if (accountPair.first != index) {
+			return false;
+		}
+
+		CharacterManager& characterMgr = CharacterManager::GetSingleton();
+
+		//unload associated characters
+		for (std::map<int, CharacterData>::iterator it = characterMgr.GetContainer()->begin(); it != characterMgr.GetContainer()->end(); /* EMPTY */) {
+			if (it->second.GetOwner() == index) {
+				fullCharacterUnload(it->first);
+				it = characterMgr.GetContainer()->begin();
+			}
+			else {
+				++it;
+			}
+		}
+
+		//unload this account
+		return true;
+	});
+}
+
+void fullCharacterUnload(int index) {
+	CharacterManager::GetSingleton().UnloadIf([index](std::pair<const int, CharacterData const&> characterPair) -> bool {
+		//skip the wrong characters
+		if (characterPair.first != index) {
+			return false;
+		}
+
+		//pop from the rooms
+		RoomManager::GetSingleton().PopCharacter(&characterPair.second);
+
+		//pump character unload
+		CharacterPacket newPacket;
+		newPacket.type = SerialPacketType::CHARACTER_DELETE;
+		newPacket.characterIndex = characterPair.first;
+		//NOTE: more character info as needed
+
+		//TODO: proximity?
+		pumpPacketProximity(&newPacket, characterPair.second.GetRoomIndex());
+
+		//unload this character
+		return true;
+	});
+}
+
+//-------------------------
+//utility functions
+//-------------------------
+
+void pumpPacket(SerialPacket* const argPacket) {
+	for (auto& it : *ClientManager::GetSingleton().GetContainer()) {
+		UDPNetworkUtility::GetSingleton().SendTo(it.second.GetAddress(), argPacket);
+	}
+}
+
+void pumpPacketProximity(SerialPacket* const argPacket, int roomIndex, Vector2 position, int distance) {
+	RoomData* roomData = RoomManager::GetSingleton().Get(roomIndex);
+
+	if (!roomData) {
+		throw(std::runtime_error("Failed to pump to a non-existant room"));
+	}
+
+	AccountData* accountData = nullptr;
+	ClientData* clientData = nullptr;
+
+	for (auto& characterIt : *roomData->GetCharacterList()) {
+		if (distance == -1 || (characterIt->GetOrigin() - position).Length() <= distance) {
+			accountData = AccountManager::GetSingleton().Get(characterIt->GetOwner());
+			clientData = ClientManager::GetSingleton().Get(accountData->GetClientIndex());
+			UDPNetworkUtility::GetSingleton().SendTo(clientData->GetAddress(), argPacket);
+		}
+	}
+}
+
+void copyCharacterToPacket(CharacterPacket* const packet, int characterIndex) {
+	CharacterData* characterData = CharacterManager::GetSingleton().Get(characterIndex);
+	if (!characterData) {
+		throw(std::runtime_error("Failed to copy a character to a packet"));
+	}
+
+	//NOTE: keep this up to date when the character changes
+	packet->characterIndex = characterIndex;
+	strncpy(packet->handle, characterData->GetHandle().c_str(), PACKET_STRING_SIZE);
+	strncpy(packet->avatar, characterData->GetAvatar().c_str(), PACKET_STRING_SIZE);
+	packet->accountIndex = characterData->GetOwner();
+	packet->roomIndex = characterData->GetRoomIndex();
+	packet->origin = characterData->GetOrigin();
+	packet->motion = characterData->GetMotion();
+}

server/server_utilities/server_utilities.hpp

@@ -0,0 +1,35 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef SERVERUTILITIES_HPP_
+#define SERVERUTILITIES_HPP_
+
+#include "serial_packet.hpp"
+#include "vector2.hpp"
+
+void fullClientUnload(int index);
+void fullAccountUnload(int index);
+void fullCharacterUnload(int index);
+void pumpPacket(SerialPacket* const argPacket);
+void pumpPacketProximity(SerialPacket* const argPacket, int roomIndex, Vector2 position = {0, 0}, int distance = -1);
+void copyCharacterToPacket(CharacterPacket* const packet, int characterIndex);
+
+#endif