From 23bc9aabcdacbb8fd4b65d322cfe48eb729fa12a Mon Sep 17 00:00:00 2001 From: Azra Victor Date: Wed, 23 Jun 2021 19:35:18 +0200 Subject: [PATCH] Fix of jump arcs hopefully --- src/gameplay/Characters/Blue/BlueBaseFrames.java | 2 +- src/gameplay/frames/Frame.java | 15 +++++---------- src/gameplay/frames/nextFrameBuffer.java | 4 ++-- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index 849f43e..9b215e7 100644 --- a/src/gameplay/Characters/Blue/BlueBaseFrames.java +++ b/src/gameplay/Characters/Blue/BlueBaseFrames.java @@ -1022,7 +1022,7 @@ public class BlueBaseFrames { String path = "textures/Sprite_sans_grille_9comp.png"; String pathToBG = "textures/arena1.png"; - Frame f = BlueNormals.ForwardDFrame0(); + Frame f = BlueNormals.crouchCFrame2(); ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null); diff --git a/src/gameplay/frames/Frame.java b/src/gameplay/frames/Frame.java index 2d0421b..f9086a9 100644 --- a/src/gameplay/frames/Frame.java +++ b/src/gameplay/frames/Frame.java @@ -232,15 +232,10 @@ public class Frame { * @param f the frame to clone */ public void cloneWithoutMovement(Frame f) { - this.cloneArray(f); //Il faut cloner individuellement chaque hitbox des differentes listes pour ne pas garder les pointeurs - Push_HitBox phb = f.getPushHitBox(); - this.setPushHitBox(new Push_HitBox(phb.getPosX(), phb.getPosY(), phb.getSize_x(), phb.getSize_y())); - this.normalCancellable = f.isNormalCancellable(); - this.specialCancellable = f.isSpecialCancellable(); - this.jumpCancellable = f.jumpCancellable; - this.moveCancellable = f.isMoveCancellable(); - this.isDashCancellable = f.isDashCancellable; - this.lastFrameOfHit = f.islastFrameOfHit(); - this.setSpriteWrap(f.sprite[0], f.sprite[1], f.sprite[2], f.sprite[3]); + double moveX = this.move_x; + double moveY = this.move_y; + this.clone(f); + this.setMove_x(moveX); + this.setMove_y(moveY); } } diff --git a/src/gameplay/frames/nextFrameBuffer.java b/src/gameplay/frames/nextFrameBuffer.java index c87919f..1bd2247 100644 --- a/src/gameplay/frames/nextFrameBuffer.java +++ b/src/gameplay/frames/nextFrameBuffer.java @@ -88,14 +88,14 @@ public class nextFrameBuffer { nextFrameBuffer fb = new nextFrameBuffer(); fb.clone(this); this.emptyQueue(); - try{fb.goToNext();} catch(IndexOutOfBoundsException e) {goOn = false;} + try{fb.goToNext();} catch(NullPointerException e) {goOn = false;} while(goOn && i < f.size()) { try{ fb.current.cloneWithoutMovement(f.get(i)); this.addFrameToQueue(fb.current); fb.goToNext(); i++; - } catch(IndexOutOfBoundsException e) { goOn = false;} + } catch(NullPointerException e) { goOn = false;} } }