animationsbug behoben

master
Jonathan Hager 6 years ago
parent 1f6fd57d8c
commit d6d70b61b7

@ -193,7 +193,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
if(temp.getType() == 2 && !temp.isTargetsPlayer()){ if(temp.getType() == 2 && !temp.isTargetsPlayer()){
for(int j = 0; j < gs.entitySprites.length; j++){ for(int j = 0; j < gs.entitySprites.length; j++){
if(i != 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())){ if(Intersector.overlaps(tempObject.getFullCollisionSprite(), gs.entitySprites[j].getFullCollisionSprite())){
delete = true; delete = true;
boolean isDead = d.getCurrentEntities()[i].attack(d.getCurrentEntities()[j]); boolean isDead = d.getCurrentEntities()[i].attack(d.getCurrentEntities()[j]);
@ -438,9 +438,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
roomPosX = roomAmount / 2; roomPosX = roomAmount / 2;
roomPosY = roomAmount / 2; roomPosY = roomAmount / 2;
} }
else if (level >= 6){
}
} }
d.setCurrentLevel(d.getLevel()[level]); d.setCurrentLevel(d.getLevel()[level]);

@ -299,6 +299,8 @@ public class GameScreen {
if(e.isToDelete()){ if(e.isToDelete()){
entitySprites[i].setDie(2); entitySprites[i].setDie(2);
} }
entitySprites[i].updateAnimation(e);
} }
} }

Loading…
Cancel
Save