fixing minor bugs, fixing velocity not changed after death, fixing server crash

src/Space.cpp

@@ -265,6 +265,7 @@ namespace ZL
 		Environment::shipState.position = Vector3f{ 0, 0, 45000.f };
 		Environment::shipState.velocity = 0.0f;
 		Environment::shipState.selectedVelocity = 0;
+		newShipVelocity = 0;
 		Environment::shipState.rotation = Eigen::Matrix3f::Identity();
 		Environment::inverseShipMatrix = Eigen::Matrix3f::Identity();
 		Environment::zoom = DEFAULT_ZOOM;
@@ -274,7 +275,21 @@ namespace ZL
 		{
 			menuManager.uiManager.findButton("minusButton")->state = ButtonState::Disabled;
 		}
-
+		if (menuManager.uiManager.findButton("plusButton"))
+		{
+			menuManager.uiManager.findButton("plusButton")->state = ButtonState::Normal;
+		}
+		if (Environment::shipState.shipType == 0)
+		{
+			if (menuManager.uiManager.findButton("shootButton"))
+			{
+				menuManager.uiManager.findButton("shootButton")->state = ButtonState::Normal;
+			}
+			if (menuManager.uiManager.findButton("shootButton2"))
+			{
+				menuManager.uiManager.findButton("shootButton2")->state = ButtonState::Normal;
+			}
+		}
 	}
 
 	void Space::setup() {
@@ -1702,6 +1717,7 @@ namespace ZL
 				gameOver = true;
 				Environment::shipState.selectedVelocity = 0;
 				Environment::shipState.velocity = 0.0f;
+				newShipVelocity = 0;
 				showExplosion = true;
 
 				explosionEmitter.setUseWorldSpace(true);
@@ -1803,7 +1819,7 @@ namespace ZL
 			}
 
 			bool canPickup = false;
-			if (Environment::shipState.shipType == 1) {
+			if (Environment::shipState.shipType == 1 && Environment::shipState.velocity < 0.1f) {
 				for (size_t i = 0; i < boxCoordsArr.size(); ++i) {
 					if (i >= boxAlive.size() || !boxAlive[i]) continue;
 					Vector3f boxWorld = boxCoordsArr[i].pos + Vector3f{ 0.f, 0.f, 45000.f };

src/network/ClientState.h

@@ -31,11 +31,11 @@ constexpr long long PLAYER_TIMEOUT_MS = 10000; //ms — disconnect if no UPD rec
 constexpr float PROJECTILE_VELOCITY = 600.f;
 constexpr float PROJECTILE_LIFE = 15000.f; //ms
 
-const float projectileHitRadius = 1.5f * 5;
-const float boxCollisionRadius = 2.0f * 5;
-const float shipCollisionRadius = 15.0f * 5;
-const float BOX_PICKUP_RADIUS = shipCollisionRadius * 5;
-const float npcCollisionRadius = 5.0f * 5;
+const float projectileHitRadius = 1.5f * 4;
+const float boxCollisionRadius = 2.0f * 4;
+const float shipCollisionRadius = 15.0f * 3;
+const float BOX_PICKUP_RADIUS = shipCollisionRadius * 3;
+const float npcCollisionRadius = 5.0f * 3;
 
 uint32_t fnv1a_hash(const std::string& data);