From d6d70b61b7ba65a9784dec94fe2f1b87f5717c92 Mon Sep 17 00:00:00 2001 From: Jonathan Hager Date: Mon, 11 May 2020 22:00:30 +0200 Subject: [PATCH] animationsbug behoben --- core/src/com/dungeoncrawler/control/Controller.java | 5 +---- core/src/com/dungeoncrawler/view/GameScreen.java | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index 2eb11fd..b9f83d0 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -193,7 +193,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ if(temp.getType() == 2 && !temp.isTargetsPlayer()){ for(int j = 0; j < gs.entitySprites.length; j++){ if(i != j){ - if(d.getCurrentEntities()[j] != null && d.getCurrentEntities()[j].getType() != 2){ + if(d.getCurrentEntities()[j] != null && d.getCurrentEntities()[j].getType() != 2 && !d.getCurrentEntities()[j].getToDelete()){ if(Intersector.overlaps(tempObject.getFullCollisionSprite(), gs.entitySprites[j].getFullCollisionSprite())){ delete = true; boolean isDead = d.getCurrentEntities()[i].attack(d.getCurrentEntities()[j]); @@ -438,9 +438,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ roomPosX = roomAmount / 2; roomPosY = roomAmount / 2; } - else if (level >= 6){ - - } } d.setCurrentLevel(d.getLevel()[level]); diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java index 7246038..144b78a 100644 --- a/core/src/com/dungeoncrawler/view/GameScreen.java +++ b/core/src/com/dungeoncrawler/view/GameScreen.java @@ -299,6 +299,8 @@ public class GameScreen { if(e.isToDelete()){ entitySprites[i].setDie(2); } + + entitySprites[i].updateAnimation(e); } }