Skip to content

Commit 209455c

Browse files
OrNOrN
committed
More refactoring
1 parent 2af33d7 commit 209455c

File tree

6 files changed

+388
-388
lines changed

6 files changed

+388
-388
lines changed

‎src/World.java

+17-17
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ public class World {
6666
// $FF: renamed from: C a.a.f[]
6767
GameModel[] terrainModels;
6868
// $FF: renamed from: D a.a.f[][]
69-
GameModel[][] gameModelArrayArray1;
69+
GameModel[][] wallModels;
7070
// $FF: renamed from: E a.a.f[][]
71-
GameModel[][] gameModelArrayArray2;
71+
GameModel[][] roofModels;
7272
// $FF: renamed from: F a.a.f
7373
GameModel parentModel;
7474

@@ -100,8 +100,8 @@ public World(Scene var1, Surface var2) {
100100
this.terrainHeightLocal = new int[this.field_840][this.field_841];
101101
this.playerAlive = false;
102102
this.terrainModels = new GameModel[64];
103-
this.gameModelArrayArray1 = new GameModel[4][64];
104-
this.gameModelArrayArray2 = new GameModel[4][64];
103+
this.wallModels = new GameModel[4][64];
104+
this.roofModels = new GameModel[4][64];
105105
this.field_823 = var1;
106106
this.surface = var2;
107107
int var3 = 0;
@@ -1267,7 +1267,7 @@ public void loadSection(int regionX, int regionY, int mapPlane, int plane) {
12671267
public void reset() {
12681268
int var4 = GameData.field_563;
12691269
if(this.field_821) {
1270-
this.field_823.method_172();
1270+
this.field_823.dispose();
12711271
}
12721272

12731273
int var1 = 0;
@@ -1278,19 +1278,19 @@ public void reset() {
12781278
this.terrainModels[var1] = null;
12791279
int var2 = 0;
12801280
if(var4 != 0) {
1281-
this.gameModelArrayArray1[var2][var1] = null;
1281+
this.wallModels[var2][var1] = null;
12821282
++var2;
12831283
}
12841284

12851285
while(var2 < 4) {
1286-
this.gameModelArrayArray1[var2][var1] = null;
1286+
this.wallModels[var2][var1] = null;
12871287
++var2;
12881288
}
12891289

12901290
int var3 = 0;
12911291
if(var4 != 0 || var3 < 4) {
12921292
do {
1293-
this.gameModelArrayArray2[var3][var1] = null;
1293+
this.roofModels[var3][var1] = null;
12941294
++var3;
12951295
} while(var3 < 4);
12961296

@@ -1418,7 +1418,7 @@ public void loadSection(int localRegionX, int localRegionY, int plane, boolean i
14181418
int var43;
14191419
int var44;
14201420
if(isLocalPlane) {
1421-
this.surface.method_223();
1421+
this.surface.blackScreen();
14221422
var7 = 0;
14231423
if(var40 != 0 || var7 < 96) {
14241424
do {
@@ -1939,15 +1939,15 @@ public void loadSection(int localRegionX, int localRegionY, int plane, boolean i
19391939
}
19401940

19411941
this.parentModel.setLight(false, 60, 24, -50, -10, -50);
1942-
this.gameModelArrayArray1[plane] = this.parentModel.split(0, 0, 1536, 1536, 8, 64, 338, true);
1942+
this.wallModels[plane] = this.parentModel.split(0, 0, 1536, 1536, 8, 64, 338, true);
19431943
var9 = 0;
19441944
if(var40 != 0) {
1945-
this.field_823.addModel(this.gameModelArrayArray1[plane][var9]);
1945+
this.field_823.addModel(this.wallModels[plane][var9]);
19461946
++var9;
19471947
}
19481948

19491949
while(var9 < 64) {
1950-
this.field_823.addModel(this.gameModelArrayArray1[plane][var9]);
1950+
this.field_823.addModel(this.wallModels[plane][var9]);
19511951
++var9;
19521952
}
19531953

@@ -2441,19 +2441,19 @@ public void loadSection(int localRegionX, int localRegionY, int plane, boolean i
24412441
}
24422442

24432443
this.parentModel.setLight(true, 50, 50, -50, -10, -50);
2444-
this.gameModelArrayArray2[plane] = this.parentModel.split(0, 0, 1536, 1536, 8, 64, 169, true);
2444+
this.roofModels[plane] = this.parentModel.split(0, 0, 1536, 1536, 8, 64, 169, true);
24452445
var13 = 0;
24462446
if(var40 != 0) {
2447-
this.field_823.addModel(this.gameModelArrayArray2[plane][var13]);
2447+
this.field_823.addModel(this.roofModels[plane][var13]);
24482448
++var13;
24492449
}
24502450

24512451
while(var13 < 64) {
2452-
this.field_823.addModel(this.gameModelArrayArray2[plane][var13]);
2452+
this.field_823.addModel(this.roofModels[plane][var13]);
24532453
++var13;
24542454
}
24552455

2456-
if(this.gameModelArrayArray2[plane][0] == null) {
2456+
if(this.roofModels[plane][0] == null) {
24572457
throw new RuntimeException("null roof!");
24582458
} else {
24592459
roof_nvs = 0;
@@ -2480,7 +2480,7 @@ public void loadSection(int localRegionX, int localRegionY, int plane, boolean i
24802480
}
24812481

24822482
// $FF: renamed from: a (a.a.f[]) void
2483-
public void method_352(GameModel[] var1) {
2483+
public void addModels(GameModel[] var1) {
24842484
int var14 = GameData.field_563;
24852485
int var2 = 0;
24862486
if(var14 != 0 || var2 < this.field_840 - 2) {

‎src/a/a/GameShell.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ public void method_15(int var1, String var2) {
624624
}
625625

626626
// $FF: renamed from: b (int, java.lang.String) void
627-
public void method_16(int var1, String var2) {
627+
public void showLoadingProgress(int var1, String var2) {
628628
try {
629629
int var3 = (this.field_1 - 281) / 2;
630630
int var4 = (this.field_2 - 148) / 2;
@@ -729,14 +729,14 @@ public byte[] readDataFile(String var1, String var2, int var3) {
729729
byte[] var6 = null;
730730

731731
try {
732-
this.method_16(var3, "Loading " + var2 + " - 0%");
732+
this.showLoadingProgress(var3, "Loading " + var2 + " - 0%");
733733
InputStream var7 = Utility.method_443(var1);
734734
DataInputStream var8 = new DataInputStream(var7);
735735
byte[] var9 = new byte[6];
736736
var8.readFully(var9, 0, 6);
737737
var4 = ((var9[0] & 255) << 16) + ((var9[1] & 255) << 8) + (var9[2] & 255);
738738
var5 = ((var9[3] & 255) << 16) + ((var9[4] & 255) << 8) + (var9[5] & 255);
739-
this.method_16(var3, "Loading " + var2 + " - 5%");
739+
this.showLoadingProgress(var3, "Loading " + var2 + " - 5%");
740740
int var10 = 0;
741741
var6 = new byte[var5];
742742
if(Surface.field_759 || var10 < var5) {
@@ -748,7 +748,7 @@ public byte[] readDataFile(String var1, String var2, int var3) {
748748

749749
var8.readFully(var6, var10, var11);
750750
var10 += var11;
751-
this.method_16(var3, "Loading " + var2 + " - " + (5 + var10 * 95 / var5) + "%");
751+
this.showLoadingProgress(var3, "Loading " + var2 + " - " + (5 + var10 * 95 / var5) + "%");
752752
} while(var10 < var5);
753753
}
754754

@@ -757,7 +757,7 @@ public byte[] readDataFile(String var1, String var2, int var3) {
757757
;
758758
}
759759

760-
this.method_16(var3, "Unpacking " + var2);
760+
this.showLoadingProgress(var3, "Unpacking " + var2);
761761
if(var5 != var4) {
762762
byte[] var13 = new byte[var4];
763763
class_18.method_397(var13, var4, var6, var5, 0);

‎src/a/a/Panel.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ public void method_277(int var1) {
255255
}
256256

257257
// $FF: renamed from: a () void
258-
public void method_278() {
258+
public void drawPanel() {
259259
boolean var2 = Surface.field_759;
260260
int var1 = 0;
261261
if(!var2 && var1 >= this.field_762) {
@@ -456,7 +456,7 @@ public void method_283(int var1, int var2, int var3, int var4) {
456456
var5 += 128;
457457
} else {
458458
do {
459-
this.field_761.method_244(var5, var6, 6 + baseSpriteStart, 128);
459+
this.field_761.drawSpriteAlpha(var5, var6, 6 + baseSpriteStart, 128);
460460
var6 += 128;
461461
} while(var6 < var2 + var4);
462462

@@ -919,7 +919,7 @@ public int addSprite(int var1, int var2, int var3) {
919919
}
920920

921921
// $FF: renamed from: a (int, int, int, int, int, int, boolean) int
922-
public int method_297(int var1, int var2, int var3, int var4, int var5, int var6, boolean var7) {
922+
public int addTextList(int var1, int var2, int var3, int var4, int var5, int var6, boolean var7) {
923923
this.field_775[this.field_762] = 4;
924924
this.field_764[this.field_762] = true;
925925
this.field_767[this.field_762] = false;
@@ -937,7 +937,7 @@ public int method_297(int var1, int var2, int var3, int var4, int var5, int var6
937937
}
938938

939939
// $FF: renamed from: a (int, int, int, int, int, int, boolean, boolean) int
940-
public int method_298(int var1, int var2, int var3, int var4, int var5, int var6, boolean var7, boolean var8) {
940+
public int addTextListInput(int var1, int var2, int var3, int var4, int var5, int var6, boolean var7, boolean var8) {
941941
this.field_775[this.field_762] = 5;
942942
this.field_764[this.field_762] = true;
943943
this.field_766[this.field_762] = var7;
@@ -1077,7 +1077,7 @@ public void method_310(int var1) {
10771077
}
10781078

10791079
// $FF: renamed from: h (int) void
1080-
public void method_311(int var1) {
1080+
public void setFocus(int var1) {
10811081
this.field_786 = var1;
10821082
}
10831083

‎src/a/a/Scene.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public Scene(Surface var1, int var2, int var3, int var4) {
207207
this.surface = var1;
208208
this.clipX = var1.field_723 / 2;
209209
this.clipY = var1.field_724 / 2;
210-
this.field_704 = var1.field_729;
210+
this.field_704 = var1.pixels;
211211
this.modelCount = 0;
212212
this.maxModelCount = var2;
213213
this.models = new GameModel[this.maxModelCount];
@@ -315,7 +315,7 @@ public void freeModel(GameModel var1) {
315315
}
316316

317317
// $FF: renamed from: a () void
318-
public void method_172() {
318+
public void dispose() {
319319
this.method_173();
320320
int var1 = 0;
321321
if(Surface.field_759) {
@@ -3596,7 +3596,7 @@ private static void method_198(int[] var0, int var1, int var2, int var3, int[] v
35963596
}
35973597

35983598
// $FF: renamed from: b (int, int, int, int, int, int, int) void
3599-
public void method_199(int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
3599+
public void setCamera(int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
36003600
var4 &= 1023;
36013601
var5 &= 1023;
36023602
var6 &= 1023;

0 commit comments

Comments
 (0)