Skip to content

Commit b79b026

Browse files
jmarshall23jmarshall23
committed
Fixed a bug were keycards would not draw on the UI.
1 parent a893ebd commit b79b026

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

‎Assets/Code/Game/Ui.cs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,7 @@ public static void weapon_amounts(player_struct p, int x, int y, int u)
468468
}
469469

470470
cw = p.curr_weapon;
471-
472-
Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(96, Engine.xdim, 320), pragmas.scale(178, Engine.ydim, 200), pragmas.scale(96 + 12, Engine.xdim, 320) - 1, pragmas.scale(178 + 6, Engine.ydim, 200) - 1);
471+
473472
if ((u & 4) != 0)
474473
{
475474
weaponnum999(DefineConstants.PISTOL_WEAPON, x, y, p.ammo_amount[DefineConstants.PISTOL_WEAPON], max_ammo_amount[DefineConstants.PISTOL_WEAPON], (char)(12 - 20 * ((cw == DefineConstants.PISTOL_WEAPON) ? 1 : 0)));
@@ -1059,10 +1058,12 @@ public static void coolgaugetext(short snum)
10591058
//15 - update kills
10601059
//16 - update FREEZE_WEAPON ammo
10611060

1061+
Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(96, Engine.xdim, 320), pragmas.scale(178, Engine.ydim, 200), pragmas.scale(96 + 12, Engine.xdim, 320) - 1, pragmas.scale(178 + 6, Engine.ydim, 200) - 1);
1062+
10621063
if (u == 0xffffffff)
10631064
{
10641065
{
1065-
Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(0, Engine.xdim, 320), pragmas.scale(0, Engine.ydim, 200), pragmas.scale(320, Engine.xdim, 320) - 1, pragmas.scale(200, Engine.ydim, 200) - 1);
1066+
// Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(0, Engine.xdim, 320), pragmas.scale(0, Engine.ydim, 200), pragmas.scale(320, Engine.xdim, 320) - 1, pragmas.scale(200, Engine.ydim, 200) - 1);
10661067
};
10671068
if (ud.multimode > 1 && ud.coop != 1)
10681069
{
@@ -1075,7 +1076,7 @@ public static void coolgaugetext(short snum)
10751076
{
10761077
if (u != 0xffffffff)
10771078
{
1078-
Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(276, Engine.xdim, 320), pragmas.scale(183, Engine.ydim, 200), pragmas.scale(299, Engine.xdim, 320) - 1, pragmas.scale(193, Engine.ydim, 200) - 1);
1079+
// Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(276, Engine.xdim, 320), pragmas.scale(183, Engine.ydim, 200), pragmas.scale(299, Engine.xdim, 320) - 1, pragmas.scale(193, Engine.ydim, 200) - 1);
10791080
};
10801081
digitalnumber(287, 200 - 17, Mathf.Max(p.frag - p.fraggedself, 0), -16, 10 + 16 + 128);
10811082
}
@@ -1086,7 +1087,7 @@ public static void coolgaugetext(short snum)
10861087
{
10871088
if (u != 0xffffffff)
10881089
{
1089-
Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(275, Engine.xdim, 320), pragmas.scale(182, Engine.ydim, 200), pragmas.scale(299, Engine.xdim, 320) - 1, pragmas.scale(194, Engine.ydim, 200) - 1);
1090+
// Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(275, Engine.xdim, 320), pragmas.scale(182, Engine.ydim, 200), pragmas.scale(299, Engine.xdim, 320) - 1, pragmas.scale(194, Engine.ydim, 200) - 1);
10901091
};
10911092
if ((p.got_access & 4) != 0)
10921093
{
@@ -1102,6 +1103,8 @@ public static void coolgaugetext(short snum)
11021103
}
11031104
}
11041105
}
1106+
1107+
11051108
if ((u & (4 + 8 + 16 + 32 + 64 + 128 + 256 + 512 + 65536)) != 0)
11061109
{
11071110
weapon_amounts(p, 96, 182, (int)u);
@@ -1111,7 +1114,7 @@ public static void coolgaugetext(short snum)
11111114
{
11121115
if (u != 0xffffffff)
11131116
{
1114-
Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(20, Engine.xdim, 320), pragmas.scale(183, Engine.ydim, 200), pragmas.scale(43, Engine.xdim, 320) - 1, pragmas.scale(193, Engine.ydim, 200) - 1);
1117+
// Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(20, Engine.xdim, 320), pragmas.scale(183, Engine.ydim, 200), pragmas.scale(43, Engine.xdim, 320) - 1, pragmas.scale(193, Engine.ydim, 200) - 1);
11151118
};
11161119
if (Engine.board.sprite[p.i].pal == 1 && p.last_extra < 2)
11171120
{
@@ -1126,7 +1129,7 @@ public static void coolgaugetext(short snum)
11261129
{
11271130
if (u != 0xffffffff)
11281131
{
1129-
Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(52, Engine.xdim, 320), pragmas.scale(183, Engine.ydim, 200), pragmas.scale(75, Engine.xdim, 320) - 1, pragmas.scale(193, Engine.ydim, 200) - 1);
1132+
// Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(52, Engine.xdim, 320), pragmas.scale(183, Engine.ydim, 200), pragmas.scale(75, Engine.xdim, 320) - 1, pragmas.scale(193, Engine.ydim, 200) - 1);
11301133
};
11311134
digitalnumber(64, 200 - 17, p.shield_amount, -16, 10 + 16 + 128);
11321135
}
@@ -1135,7 +1138,7 @@ public static void coolgaugetext(short snum)
11351138
{
11361139
if (u != 0xffffffff)
11371140
{
1138-
Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(196, Engine.xdim, 320), pragmas.scale(183, Engine.ydim, 200), pragmas.scale(219, Engine.xdim, 320) - 1, pragmas.scale(193, Engine.ydim, 200) - 1);
1141+
// Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(196, Engine.xdim, 320), pragmas.scale(183, Engine.ydim, 200), pragmas.scale(219, Engine.xdim, 320) - 1, pragmas.scale(193, Engine.ydim, 200) - 1);
11391142
};
11401143
if (p.curr_weapon != DefineConstants.KNEE_WEAPON)
11411144
{
@@ -1158,13 +1161,13 @@ public static void coolgaugetext(short snum)
11581161
if ((u & (2048 + 4096)) != 0)
11591162
{
11601163
{
1161-
Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(231, Engine.xdim, 320), pragmas.scale(179, Engine.ydim, 200), pragmas.scale(265, Engine.xdim, 320) - 1, pragmas.scale(197, Engine.ydim, 200) - 1);
1164+
// Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(231, Engine.xdim, 320), pragmas.scale(179, Engine.ydim, 200), pragmas.scale(265, Engine.xdim, 320) - 1, pragmas.scale(197, Engine.ydim, 200) - 1);
11621165
};
11631166
}
11641167
else
11651168
{
11661169
{
1167-
Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(250, Engine.xdim, 320), pragmas.scale(190, Engine.ydim, 200), pragmas.scale(261, Engine.xdim, 320) - 1, pragmas.scale(195, Engine.ydim, 200) - 1);
1170+
// Engine.rotatesprite(0, (200 - 34) << 16, 65536, 0, DefineConstants.BOTTOMSTATUSBAR, 4, 0, 10 + 16 + 64 + 128, pragmas.scale(250, Engine.xdim, 320), pragmas.scale(190, Engine.ydim, 200), pragmas.scale(261, Engine.xdim, 320) - 1, pragmas.scale(195, Engine.ydim, 200) - 1);
11681171
};
11691172
}
11701173
}

0 commit comments

Comments
 (0)