From 0ebc582e4021373df73148718f0e5320734851d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Autin?= Date: Thu, 24 Jun 2021 00:01:12 +0200 Subject: [PATCH 1/2] Fixed merge conflict? --- src/gameplay/Characters/Blue/BlueBaseFrames.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index 849f43e..192de90 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.crouchAFrame1(); ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null); From e74903508d797f2a360577406ae1eef84310069f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o?= Date: Thu, 24 Jun 2021 00:22:54 +0200 Subject: [PATCH 2/2] old version of clone method in nextframebuffer --- src/gameplay/frames/nextFrameBuffer.java | 29 +++++++++++++----------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/gameplay/frames/nextFrameBuffer.java b/src/gameplay/frames/nextFrameBuffer.java index 6d6cb3f..cd935fe 100644 --- a/src/gameplay/frames/nextFrameBuffer.java +++ b/src/gameplay/frames/nextFrameBuffer.java @@ -24,20 +24,23 @@ public class nextFrameBuffer { } public void clone(nextFrameBuffer f) { + this.current = f.current; + this.next = f.next; - try{ - Frame cf = new Frame(); - cf.clone(f.current); - this.current = cf; } - catch (NullPointerException n) { - this.current = null; - this.next = null; - } - nextFrameBuffer nfb = new nextFrameBuffer(); - try { - nfb.clone(f.next); - } catch (NullPointerException n) {} - this.next = nfb; + +// try{ +// Frame cf = new Frame(); +// cf.clone(f.current); +// this.current = cf; } +// catch (NullPointerException n) { +// this.current = null; +// this.next = null; +// } +// nextFrameBuffer nfb = new nextFrameBuffer(); +// try { +// nfb.clone(f.next); +// } catch (NullPointerException n) {} +// this.next = nfb; }