Fixing bugs

src/Game.cpp

@@ -146,6 +146,13 @@ namespace ZL
 
 		menuManager.setupMenu();
 
+		menuManager.onMainMenuEntered = [this]() {
+			if (networkClient) {
+				networkClient->Disconnect();
+				networkClient.reset();
+			}
+		};
+
 		menuManager.onSingleplayerPressed = [this](const std::string& nickname, int shipType) {
 			Environment::shipState.nickname = nickname;
 			Environment::shipState.shipType = shipType;
@@ -169,6 +176,7 @@ namespace ZL
 			networkClient = std::unique_ptr<INetworkClient>(localClient);
 			networkClient->Connect("", 0);
 
+			space.resetPlayerState();
 			lastTickCount = 0;
 			};
 
@@ -195,6 +203,7 @@ namespace ZL
 			space.boxAlive.clear();
 			space.serverBoxesApplied = false;
 
+			space.resetPlayerState();
 			connectingStartTicks = SDL_GetTicks();
 			lastTickCount = 0;
 			};