Started moving around static methods/fields

This commit is contained in:
Pazaz 2022-04-25 00:49:33 -04:00
parent bed128bd19
commit 6ba1f2f808
305 changed files with 5027 additions and 5075 deletions

View file

@ -118,31 +118,31 @@ public final class WorldMapFont {
@Pc(21) int local21 = arg4[arg0 + 3];
@Pc(27) int local27 = arg4[arg0 + 4];
@Pc(47) int local47 = arg4[arg0] * 16384 + arg4[arg0 + 1] * 128 + arg4[arg0 + 2];
@Pc(53) int local53 = local7 + local15 * Static129.width;
@Pc(57) int local57 = Static129.width - local21;
@Pc(53) int local53 = local7 + local15 * SoftwareRaster.width;
@Pc(57) int local57 = SoftwareRaster.width - local21;
@Pc(59) int local59 = 0;
@Pc(66) int local66;
if (local15 < Static129.clipTop) {
local66 = Static129.clipTop - local15;
if (local15 < SoftwareRaster.clipTop) {
local66 = SoftwareRaster.clipTop - local15;
local27 -= local66;
local15 = Static129.clipTop;
local15 = SoftwareRaster.clipTop;
local47 += local66 * local21;
local53 += local66 * Static129.width;
local53 += local66 * SoftwareRaster.width;
}
if (local15 + local27 >= Static129.clipBottom) {
local27 -= local15 + local27 + 1 - Static129.clipBottom;
if (local15 + local27 >= SoftwareRaster.clipBottom) {
local27 -= local15 + local27 + 1 - SoftwareRaster.clipBottom;
}
if (local7 < Static129.clipLeft) {
local66 = Static129.clipLeft - local7;
if (local7 < SoftwareRaster.clipLeft) {
local66 = SoftwareRaster.clipLeft - local7;
local21 -= local66;
local7 = Static129.clipLeft;
local7 = SoftwareRaster.clipLeft;
local47 += local66;
local53 += local66;
local59 = local66;
local57 += local66;
}
if (local7 + local21 >= Static129.clipRight) {
local66 = local7 + local21 + 1 - Static129.clipRight;
if (local7 + local21 >= SoftwareRaster.clipRight) {
local66 = local7 + local21 + 1 - SoftwareRaster.clipRight;
local21 -= local66;
local59 += local66;
local57 += local66;
@ -151,9 +151,9 @@ public final class WorldMapFont {
return;
}
if (this.grayscale) {
this.renderGlyphGrayscale(Static129.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59);
this.renderGlyphGrayscale(SoftwareRaster.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59);
} else {
this.renderGlyphMono(Static129.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59);
this.renderGlyphMono(SoftwareRaster.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59);
}
}
@ -201,7 +201,7 @@ public final class WorldMapFont {
public final void renderStringCenter(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
@Pc(5) int local5 = this.getStringWidth(arg0) / 2;
@Pc(8) int local8 = this.method1511();
if (arg1 - local5 <= Static129.clipRight && (arg1 + local5 >= Static129.clipLeft && (arg2 - local8 <= Static129.clipBottom && arg2 >= 0))) {
if (arg1 - local5 <= SoftwareRaster.clipRight && (arg1 + local5 >= SoftwareRaster.clipLeft && (arg2 - local8 <= SoftwareRaster.clipBottom && arg2 >= 0))) {
this.renderString(arg0, arg1 - local5, arg2, arg3, true);
}
}