From 039496dbfc117fc8dbc7d45b87595ef049e3e22c Mon Sep 17 00:00:00 2001
From: lnittsch <lnittsch@uni-bremen.de>
Date: Tue, 26 May 2020 10:39:38 +0200
Subject: [PATCH] removed Pair in favor of float Array
---
.../galaxytruckerreloaded/Model/Map/Overworld.java | 3 +--
.../galaxytruckerreloaded/Model/Map/Planet.java | 2 ++
.../com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java | 5 +++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java
index fa3ebe1f..27ca5240 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java
@@ -1,11 +1,10 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.Map;
-import jdk.internal.util.xml.impl.Pair;
import java.util.HashMap;
public class Overworld {
- private HashMap<Pair,Planet> planetMap;
+ private HashMap<float[],Planet> planetMap;
public Overworld(int seed) {
planetMap = new HashMap<>();
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java
index 8b11bac5..0d175fa2 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java
@@ -8,6 +8,8 @@ public abstract class Planet {
private float posX;
/** Vertikale Position auf der Karte */
private float posY;
+
+ private float[] position;
/** Ereignis dass auf diesem Planeten eintrifft */
private PlanetEvent event;
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
index e72e0ff2..0a940a78 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
@@ -1,6 +1,7 @@
package com.galaxytrucker.galaxytruckerreloaded.Model;
-import jdk.internal.util.xml.impl.Pair;
+
+import com.galaxytrucker.galaxytruckerreloaded.Model.Map.Planet;
public class Ship {
@@ -39,7 +40,7 @@ public class Ship {
/**
* X and Y coordinates on the map
*/
- private Pair position;
+ private Planet position;
/**
* time needed until position can be changed again
--
GitLab