Loads of refactoring, renamed Class3_Sub13 to EnumStringEntry too

This commit is contained in:
Pazaz 2022-04-23 16:25:30 -04:00
parent e11ef7d372
commit d2c6c19cb8
263 changed files with 2432 additions and 2436 deletions

View file

@ -50,56 +50,56 @@ public final class Static110 {
@Pc(141) int local141;
for (local6 = (AreaSound) Static152.aClass69_87.method2289(); local6 != null; local6 = (AreaSound) Static152.aClass69_87.method2288()) {
local37 = 1;
local42 = local6.aClass8_Sub4_Sub2_1.method2681();
if (local42.anInt1037 == local6.aClass8_Sub4_Sub2_1.anInt3366) {
local42 = local6.npc.method2681();
if (local42.idleAnimationId == local6.npc.anInt3366) {
local37 = 0;
} else if (local42.anInt1058 == local6.aClass8_Sub4_Sub2_1.anInt3366 || local42.anInt1054 == local6.aClass8_Sub4_Sub2_1.anInt3366 || local42.anInt1045 == local6.aClass8_Sub4_Sub2_1.anInt3366 || local42.anInt1043 == local6.aClass8_Sub4_Sub2_1.anInt3366) {
} else if (local42.runAnimationId == local6.npc.anInt3366 || local42.runAnimationId2 == local6.npc.anInt3366 || local42.runAnimationId4 == local6.npc.anInt3366 || local42.runAnimationId3 == local6.npc.anInt3366) {
local37 = 2;
} else if (local42.anInt1062 == local6.aClass8_Sub4_Sub2_1.anInt3366 || local42.anInt1042 == local6.aClass8_Sub4_Sub2_1.anInt3366 || local6.aClass8_Sub4_Sub2_1.anInt3366 == local42.anInt1048 || local42.anInt1066 == local6.aClass8_Sub4_Sub2_1.anInt3366) {
} else if (local42.anInt1062 == local6.npc.anInt3366 || local42.anInt1042 == local6.npc.anInt3366 || local6.npc.anInt3366 == local42.anInt1048 || local42.anInt1066 == local6.npc.anInt3366) {
local37 = 3;
}
if (local6.anInt2038 != local37) {
local141 = Static112.method2299(local6.aClass8_Sub4_Sub2_1);
if (local141 != local6.anInt2044) {
if (local6.aClass3_Sub3_Sub1_1 != null) {
Static204.soundStream.method1347(local6.aClass3_Sub3_Sub1_1);
local6.aClass3_Sub3_Sub1_1 = null;
local141 = Static112.getSound(local6.npc);
if (local141 != local6.sound) {
if (local6.primaryStream != null) {
Static204.soundStream.removeSubStream(local6.primaryStream);
local6.primaryStream = null;
}
local6.anInt2044 = local141;
local6.sound = local141;
}
local6.anInt2038 = local37;
}
local6.anInt2041 = local6.aClass8_Sub4_Sub2_1.anInt3412;
local6.anInt2037 = local6.aClass8_Sub4_Sub2_1.anInt3412 + local6.aClass8_Sub4_Sub2_1.method2693() * 64;
local6.anInt2029 = local6.aClass8_Sub4_Sub2_1.anInt3421;
local6.anInt2028 = local6.aClass8_Sub4_Sub2_1.anInt3421 + local6.aClass8_Sub4_Sub2_1.method2693() * 64;
local6.anInt2041 = local6.npc.xFine;
local6.anInt2037 = local6.npc.xFine + local6.npc.getSize() * 64;
local6.anInt2029 = local6.npc.zFine;
local6.anInt2028 = local6.npc.zFine + local6.npc.getSize() * 64;
Static150.method2804(arg1, local6, arg3, arg0, arg2);
}
for (local6 = (AreaSound) Static93.aClass133_7.method3859(); local6 != null; local6 = (AreaSound) Static93.aClass133_7.method3861()) {
for (local6 = (AreaSound) Static93.aClass133_7.head(); local6 != null; local6 = (AreaSound) Static93.aClass133_7.next()) {
local37 = 1;
local42 = local6.aClass8_Sub4_Sub1_1.method2681();
if (local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1037) {
local42 = local6.player.method2681();
if (local6.player.anInt3366 == local42.idleAnimationId) {
local37 = 0;
} else if (local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1058 || local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1054 || local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1045 || local42.anInt1043 == local6.aClass8_Sub4_Sub1_1.anInt3366) {
} else if (local6.player.anInt3366 == local42.runAnimationId || local6.player.anInt3366 == local42.runAnimationId2 || local6.player.anInt3366 == local42.runAnimationId4 || local42.runAnimationId3 == local6.player.anInt3366) {
local37 = 2;
} else if (local42.anInt1062 == local6.aClass8_Sub4_Sub1_1.anInt3366 || local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1042 || local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1048 || local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1066) {
} else if (local42.anInt1062 == local6.player.anInt3366 || local6.player.anInt3366 == local42.anInt1042 || local6.player.anInt3366 == local42.anInt1048 || local6.player.anInt3366 == local42.anInt1066) {
local37 = 3;
}
if (local6.anInt2038 != local37) {
local141 = Static140.method2706(local6.aClass8_Sub4_Sub1_1);
if (local6.anInt2044 != local141) {
if (local6.aClass3_Sub3_Sub1_1 != null) {
Static204.soundStream.method1347(local6.aClass3_Sub3_Sub1_1);
local6.aClass3_Sub3_Sub1_1 = null;
local141 = Static140.getSound(local6.player);
if (local6.sound != local141) {
if (local6.primaryStream != null) {
Static204.soundStream.removeSubStream(local6.primaryStream);
local6.primaryStream = null;
}
local6.anInt2044 = local141;
local6.sound = local141;
}
local6.anInt2038 = local37;
}
local6.anInt2041 = local6.aClass8_Sub4_Sub1_1.anInt3412;
local6.anInt2037 = local6.aClass8_Sub4_Sub1_1.anInt3412 + local6.aClass8_Sub4_Sub1_1.method2693() * 64;
local6.anInt2029 = local6.aClass8_Sub4_Sub1_1.anInt3421;
local6.anInt2028 = local6.aClass8_Sub4_Sub1_1.anInt3421 + local6.aClass8_Sub4_Sub1_1.method2693() * 64;
local6.anInt2041 = local6.player.xFine;
local6.anInt2037 = local6.player.xFine + local6.player.getSize() * 64;
local6.anInt2029 = local6.player.zFine;
local6.anInt2028 = local6.player.zFine + local6.player.getSize() * 64;
Static150.method2804(arg1, local6, arg3, arg0, arg2);
}
}