115 - fix

AtomicMaya · Dec 13, 2017 · eac57a6 · eac57a6
1 parent 30effde
commit eac57a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/main/game/actor/GameManager.java b/src/main/game/actor/GameManager.java
@@ -238,6 +238,7 @@ private void restart() {
 		startCheckpoint = null;
 		lastCheckpoint = null;
 		savedScore = 0;
+		score = 0;
 		reset();
 	}
 
@@ -248,7 +249,7 @@ private void reset() {
 		messageDisplayed = "";
 		respawnTimer = 0;
 		saveLoaded = null;
-		resetScore();
+		score = savedScore;
 	}
 
 	/** Spawn a new {@linkplain Bike} at the right place */
@@ -261,12 +262,6 @@ private void spawnBike() {
 
 	}
 
-	// score management
-	/** Reset the score */
-	private void resetScore() {
-		score = 0;
-	}
-
 	public void addToScore(int score) {
 		this.score += score;
 	}

diff --git a/src/main/game/actor/weapons/Weapon.java b/src/main/game/actor/weapons/Weapon.java
@@ -165,7 +165,7 @@ protected boolean hasShot() {
 	 */
 	public void addAmmo(int quantity) {
 		this.ammoCount += quantity;
-		this.amoNumber.setText(this.amoText + this.ammoCount);
+		this.amoNumber.setText(this.ammoCount + this.amoText);
 	}
 
 	/** @return whether this weapon is deployed */