merge

src/Space.cpp

@@ -276,7 +276,7 @@ namespace ZL
 					std::cerr << "Client: Failed to send RESPAWN\n";
 				}
 			}
-
+			this->playerScore = 0;
 			std::cerr << "Game restarted\n";
 			};
 
@@ -1598,7 +1598,7 @@ namespace ZL
 
 				std::cerr << "GAME OVER: collision with planet (moved back and exploded)\n";
 
-				menuManager.showGameOver();
+				menuManager.showGameOver(this->playerScore);
 			}
 			else {
 				bool stoneCollided = false;
@@ -1673,7 +1673,7 @@ namespace ZL
 						planetObject.planetStones.statuses[collidedTriIdx] = ChunkStatus::Empty;
 					}
 
-					menuManager.showGameOver();
+					menuManager.showGameOver(this->playerScore);
 				}
 			}
 		}
@@ -1777,12 +1777,17 @@ namespace ZL
 						shipAlive = false;
 						gameOver = true;
 						Environment::shipState.velocity = 0.0f;
-						menuManager.showGameOver();
+						menuManager.showGameOver(this->playerScore);
 					}
 					else {
 						deadRemotePlayers.insert(d.targetId);
 						std::cout << "Marked remote player " << d.targetId << " as dead" << std::endl;
 					}
+					if (d.killerId == localId) {
+						this->playerScore += 1;
+						std::cout << "Client: Increased local score to " << this->playerScore << std::endl;
+						
+					}
 				}
 			}