From 20c3ea7155e7d08670e875f1052e86f9b4f1cffa Mon Sep 17 00:00:00 2001 From: David96 Date: Thu, 31 Dec 2020 13:58:53 +0100 Subject: [PATCH] Rename Welt to World MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All this german code confuses me that much, that I do it myself… --- GameScreen.java | 12 ++++++------ Welt.java => World.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) rename Welt.java => World.java (97%) diff --git a/GameScreen.java b/GameScreen.java index a6a8410..d678d4a 100644 --- a/GameScreen.java +++ b/GameScreen.java @@ -5,7 +5,7 @@ class GameScreen { private final List _drawables; private final Bird _bird; - private final Welt _welt; + private final World _world; private double _totalTime; private int _try; @@ -13,7 +13,7 @@ class GameScreen { _drawables = new ArrayList(); _bird = new Bird(this); - _welt = new Welt(this); + _world = new World(this); _totalTime = 0; _try = 1; } @@ -24,13 +24,13 @@ class GameScreen public void update(double elapsed) { _bird.update(elapsed); - _welt.update(elapsed); + _world.update(elapsed); _totalTime += elapsed; System.out.print("\r" + _try + " - Time survived: " + (int)(_totalTime * 1e-3) + "s, " + - "speed: " + (int)_welt.getSpeed() + "px/s"); + "speed: " + (int)_world.getSpeed() + "px/s"); Rectangle birdRect = _bird.getRect(); - if (_welt.checkCollision(_bird.getRect()) + if (_world.checkCollision(_bird.getRect()) || birdRect.getY() + birdRect.getHeight() > TurtleWelt.HEIGHT || birdRect.getY() + birdRect.getHeight() < 0) { @@ -38,7 +38,7 @@ class GameScreen ++_try; _totalTime = 0; _bird.reset(); - _welt.reset(); + _world.reset(); } } diff --git a/Welt.java b/World.java similarity index 97% rename from Welt.java rename to World.java index 4891ba8..31382b6 100644 --- a/Welt.java +++ b/World.java @@ -1,7 +1,7 @@ import java.util.ArrayList; import java.util.Random; -class Welt implements Drawable +class World implements Drawable { private static final int DISTANCE = 250; private final ArrayList _obstacles; @@ -9,7 +9,7 @@ class Welt implements Drawable private double _acc = 2; private final Random _random; - public Welt(GameScreen game) + public World(GameScreen game) { game.addDrawable(this); _random = new Random();