From 84a308dc594114285391f19294f8ade55fe40381 Mon Sep 17 00:00:00 2001 From: Arthur Bols Date: Sat, 19 May 2018 10:56:41 +0200 Subject: [PATCH] small change --- OGP1718-Worms/src/worms/model/Program.java | 5 +++++ OGP1718-Worms/src/worms/model/Projectile.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/OGP1718-Worms/src/worms/model/Program.java b/OGP1718-Worms/src/worms/model/Program.java index 4c1c327..1a83014 100644 --- a/OGP1718-Worms/src/worms/model/Program.java +++ b/OGP1718-Worms/src/worms/model/Program.java @@ -1,5 +1,6 @@ package worms.model; +import worms.internal.gui.game.IActionHandler; import worms.programs.Procedure; import worms.programs.Statement; @@ -16,6 +17,10 @@ public class Program { this.main = main; } + protected void execute(Worm worm) { + + } + public Worm getWorm() { return null; diff --git a/OGP1718-Worms/src/worms/model/Projectile.java b/OGP1718-Worms/src/worms/model/Projectile.java index bb68957..5022f56 100644 --- a/OGP1718-Worms/src/worms/model/Projectile.java +++ b/OGP1718-Worms/src/worms/model/Projectile.java @@ -82,7 +82,7 @@ public abstract class Projectile extends GameObject { private double jumpVelocity() { // wat met de action points? - double force = 5 * Worm.getActionPoints() + getMass() * G; + double force = 5 ;//* Worm.getActionPoints() + getMass() * G; return force/getMass() * FORCE_TIME; } @@ -137,7 +137,7 @@ public abstract class Projectile extends GameObject { throw new IllegalStateException(); double v = jumpVelocity(); - double t = getJumpTime(); + double t = 0;//getJumpTime(); double a = getOrientation(); Coordinate newLocation = Coordinate.create(getLocation().getX() + v * t * cos(a), getLocation().getY() + v * t * sin(a) - (G * t * t) / 2.0);