UDPNetworkUtility is a singleton, disabled InCombat scene

I found incombat to be way too finicky to keep up to date, so I disabled
it for now.

client/scenes/clean_up.cpp

@@ -31,13 +31,11 @@
 //-------------------------
 
 CleanUp::CleanUp(
-	UDPNetworkUtility* const argNetwork,
 	int* const argClientIndex,
 	int* const argAccountIndex,
 	int* const argCharacterIndex,
 	CharacterMap* argCharacterMap
 	):
-	network(*argNetwork),
 	clientIndex(*argClientIndex),
 	accountIndex(*argAccountIndex),
 	characterIndex(*argCharacterIndex),

client/scenes/clean_up.hpp

@@ -45,7 +45,6 @@ class CleanUp : public BaseScene {
 public:
 	//Public access members
 	CleanUp(
-		UDPNetworkUtility* const argNetwork,
 		int* const argClientIndex,
 		int* const argAccountIndex,
 		int* const argCharacterIndex,
@@ -68,7 +67,7 @@ protected:
 	void KeyUp(SDL_KeyboardEvent const&);
 
 	//shared parameters
-	UDPNetworkUtility& network;
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
 	int& clientIndex;
 	int& accountIndex;
 	int& characterIndex;

client/scenes/in_world.cpp

@@ -35,13 +35,11 @@
 //-------------------------
 
 InWorld::InWorld(
-	UDPNetworkUtility* const argNetwork,
 	int* const argClientIndex,
 	int* const argAccountIndex,
 	int* const argCharacterIndex,
 	CharacterMap* argCharacterMap
 	):
-	network(*argNetwork),
 	clientIndex(*argClientIndex),
 	accountIndex(*argAccountIndex),
 	characterIndex(*argCharacterIndex),

client/scenes/in_world.hpp

@@ -49,7 +49,6 @@ class InWorld : public BaseScene {
 public:
 	//Public access members
 	InWorld(
-		UDPNetworkUtility* const argNetwork,
 		int* const argClientIndex,
 		int* const argAccountIndex,
 		int* const argCharacterIndex,
@@ -92,7 +91,7 @@ protected:
 	void UpdateMap();
 
 	//shared parameters
-	UDPNetworkUtility& network;
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
 	int& clientIndex;
 	int& accountIndex;
 	int& characterIndex;

client/scenes/lobby_menu.cpp

@@ -30,12 +30,7 @@
 //Public access members
 //-------------------------
 
-LobbyMenu::LobbyMenu(
-	UDPNetworkUtility* const argNetwork,
-	int* const argClientIndex,
-	int* const argAccountIndex
-	):
-	network(*argNetwork),
+LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
 	clientIndex(*argClientIndex),
 	accountIndex(*argAccountIndex)
 {

client/scenes/lobby_menu.hpp

@@ -40,11 +40,7 @@
 class LobbyMenu : public BaseScene {
 public:
 	//Public access members
-	LobbyMenu(
-		UDPNetworkUtility* const argNetwork,
-		int* const argClientIndex,
-		int* const argAccountIndex
-	);
+	LobbyMenu(int* const argClientIndex, int* const argAccountIndex);
 	~LobbyMenu();
 
 protected:
@@ -68,7 +64,7 @@ protected:
 
 	//shared parameters
 	ConfigUtility& config = ConfigUtility::GetSingleton();
-	UDPNetworkUtility& network;
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
 	int& clientIndex;
 	int& accountIndex;