rs-client: refactoring (#1344)

* Rename some things to be more consistent everywhere

* rs-client: refactoring

* MenuAction -> MenuOpcode merge
This commit is contained in:
Lucwousin
2019-08-20 22:24:51 +02:00
committed by GitHub
parent 0f46656e9d
commit db705f5dd5
297 changed files with 13734 additions and 14043 deletions

View File

@@ -11,8 +11,8 @@ public class PcmPlayer {
@ObfuscatedGetter(
intValue = 1278180609
)
@Export("pcmPlayerCount")
static int pcmPlayerCount;
@Export("PcmPlayer_count")
static int PcmPlayer_count;
@ObfuscatedName("r")
@Export("samples")
protected int[] samples;
@@ -181,13 +181,14 @@ public class PcmPlayer {
try {
if (0L != this.field1416) {
if (var1 < this.field1416) {
if (var1 >= this.field1416) {
this.open(this.capacity);
this.field1416 = 0L;
this.field1421 = true;
} else {
return;
}
this.open(this.capacity);
this.field1416 = 0L;
this.field1421 = true;
}
int var3 = this.position();
@@ -223,17 +224,15 @@ public class PcmPlayer {
}
if (var1 > this.field1420) {
if (!this.field1421) {
if (this.field1417 == 0 && this.field1418 == 0) {
this.close();
this.field1416 = 2000L + var1;
return;
}
if (this.field1421) {
this.field1421 = false;
} else if (this.field1417 != 0 || this.field1418 != 0) {
this.field1413 = Math.min(this.field1418, this.field1417);
this.field1418 = this.field1417;
} else {
this.field1421 = false;
this.close();
this.field1416 = 2000L + var1;
return;
}
this.field1417 = 0;
@@ -341,7 +340,7 @@ public class PcmPlayer {
@Export("fill")
final void fill(int[] var1, int var2) {
int var3 = var2;
if (class169.isStereo) {
if (FileSystem.PcmPlayer_stereo) {
var3 = var2 << 1;
}
@@ -354,10 +353,8 @@ public class PcmPlayer {
int var4 = 0;
int var5 = 255;
int var6;
PcmStream var10;
label104:
for (var6 = 7; var5 != 0; --var6) {
for (int var6 = 7; var5 != 0; --var6) {
int var7;
int var8;
if (var6 < 0) {
@@ -368,67 +365,59 @@ public class PcmPlayer {
var8 = 0;
}
for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) {
if ((var9 & 1) != 0) {
var5 &= ~(1 << var7);
var10 = null;
PcmStream var11 = this.field1426[var7];
for (int var9 = var5 >>> var7 & 0x11111111; var9 != 0; var9 >>>= 4, var7 += 4, ++var8) {
if ((var9 & 1) == 0) {
continue;
}
var5 &= ~(1 << var7);
var10 = null;
label98:
while (true) {
while (true) {
if (var11 == null) {
break label98;
}
AbstractSound var12 = var11.sound;
if (var12 != null && var12.position > var8) {
var5 |= 1 << var7;
var10 = var11;
var11 = var11.after;
} else {
var11.active = true;
int var13 = var11.vmethod3892();
var4 += var13;
if (var12 != null) {
var12.position += var13;
}
for (PcmStream var11 = this.field1426[var7]; var11 != null;) {
AbstractSound var12 = var11.sound;
if (var12 != null && var12.position > var8) {
var5 |= 1 << var7;
var10 = var11;
var11 = var11.after;
continue;
}
var11.active = true;
int var13 = var11.vmethod3892();
var4 += var13;
if (var12 != null) {
var12.position += var13;
}
if (var4 >= this.field1406) {
break label104;
}
if (var4 >= this.field1406) {
return;
}
PcmStream var14 = var11.firstSubStream();
if (var14 != null) {
for (int var15 = var11.field1496; var14 != null; var14 = var11.nextSubStream()) {
this.method2456(var14, var15 * var14.vmethod2689() >> 8);
}
}
PcmStream var18 = var11.after;
var11.after = null;
if (var10 == null) {
this.field1426[var7] = var18;
} else {
var10.after = var18;
}
if (var18 == null) {
this.field1425[var7] = var10;
}
var11 = var18;
}
PcmStream var14 = var11.firstSubStream();
if (var14 != null) {
for (int var15 = var11.field1496; var14 != null; var14 = var11.nextSubStream()) {
this.method2456(var14, var15 * var14.vmethod2689() >> 8);
}
}
}
var7 += 4;
++var8;
PcmStream var18 = var11.after;
var11.after = null;
if (var10 == null) {
this.field1426[var7] = var18;
}
else {
var10.after = var18;
}
if (var18 == null) {
this.field1425[var7] = var10;
}
var11 = var18;
}
}
}
for (var6 = 0; var6 < 8; ++var6) {
for (int var6 = 0; var6 < 8; ++var6) {
PcmStream var16 = this.field1426[var6];
PcmStream[] var17 = this.field1426;
this.field1425[var6] = null;