Rativel/jeu-de-combat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
no 2021-06-24 00:15:39 +02:00
commit 3f9beb1198
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gameplay/Characters/Blue/BlueBaseFrames.java
View File

@ -1024,7 +1024,6 @@ public class BlueBaseFrames {
Frame f = BlueNormals.JumpDFrame2(); Frame f = BlueNormals.JumpDFrame2();
ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null); ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null);
blue.setTextureWrap(f.getSprite()[0], f.getSprite()[1], f.getSprite()[2], f.getSprite()[3]); blue.setTextureWrap(f.getSprite()[0], f.getSprite()[1], f.getSprite()[2], f.getSprite()[3]);

29
src/gameplay/frames/nextFrameBuffer.java
View File

@ -24,20 +24,23 @@ public class nextFrameBuffer {
} }
public void clone(nextFrameBuffer f) { public void clone(nextFrameBuffer f) {
this.current = f.current;
this.next = f.next;
try{
Frame cf = new Frame(); // try{
cf.clone(f.current); // Frame cf = new Frame();
this.current = cf; } // cf.clone(f.current);
catch (NullPointerException n) { // this.current = cf; }
this.current = null; // catch (NullPointerException n) {
this.next = null; // this.current = null;
} // this.next = null;
nextFrameBuffer nfb = new nextFrameBuffer(); // }
try { // nextFrameBuffer nfb = new nextFrameBuffer();
nfb.clone(f.next); // try {
} catch (NullPointerException n) {} // nfb.clone(f.next);
this.next = nfb; // } catch (NullPointerException n) {}
// this.next = nfb;
} }