merge conflict

oneseedfruit · Apr 23, 2018 · 7385e35 · 7385e35
1 parent 7f9e3e2
commit 7385e35
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/images/pong_meatball_all.pyxel b/images/pong_meatball_all.pyxel
diff --git a/js/Main/Car.js b/js/Main/Car.js
@@ -77,11 +77,13 @@ function carClass() {
 		this.x += Math.cos(this.ang) * this.speed;
 		this.y += Math.sin(this.ang) * this.speed;
 		this.distanceTravelled += (Math.abs(Math.cos(this.ang) * this.speed)) + Math.abs((Math.sin(this.ang) * this.speed));
-		if (this.distanceTravelled >= 300) {
+		if (this.distanceTravelled >= 315) {
 			var currentFrameIndex = fuelMeterSprite.getFrameIndex();
+			var fuelMeterSpriteMaxFrames = 9;
 			currentFrameIndex++;
-			fuelMeterSprite.setFrameIndex(currentFrameIndex);
 			this.distanceTravelled = 0;
+			if (currentFrameIndex < fuelMeterSpriteMaxFrames)
+				fuelMeterSprite.setFrameIndex(currentFrameIndex);
 		} 
 
 		//Cam point leads player around

diff --git a/js/Main/Input.js b/js/Main/Input.js
@@ -94,7 +94,6 @@ function keyPressed(evt) {
 			break;
 		case KEY_S:
 		case KEY_DOWN_ARROW:
-			fuelMeterSprite.setFrameIndex(8);
 			break;
 		case KEY_D:
 		case KEY_RIGHT_ARROW: