mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-17 18:21:10 +00:00
Minimum fill for temperature gauge if you have any wads loaded at all.
This commit is contained in:
parent
c2705b4662
commit
e2f6366292
1 changed files with 19 additions and 14 deletions
13
src/m_menu.c
13
src/m_menu.c
|
@ -4753,7 +4753,8 @@ static void M_DrawTemperature(INT32 x, fixed_t t)
|
|||
t = 0;*/
|
||||
|
||||
// scale
|
||||
t = (FixedMul(h<<FRACBITS, FRACUNIT - t)>>FRACBITS);
|
||||
if (t > 1)
|
||||
t = (FixedMul(h<<FRACBITS, t)>>FRACBITS);
|
||||
|
||||
// border
|
||||
V_DrawFill(x - 1, vpadding, 1, h, 3);
|
||||
|
@ -4762,7 +4763,9 @@ static void M_DrawTemperature(INT32 x, fixed_t t)
|
|||
V_DrawFill(x - 1, vpadding+h, width+2, 1, 3);
|
||||
|
||||
// bar itself
|
||||
for (y = h; y > 0; y--)
|
||||
y = h;
|
||||
if (t)
|
||||
for (t = h - t; y > 0; y--)
|
||||
{
|
||||
UINT8 colours[NUMCOLOURS] = {42, 40, 58, 222, 65, 90, 97, 98};
|
||||
UINT8 c;
|
||||
|
@ -4865,11 +4868,13 @@ static void M_DrawAddons(void)
|
|||
? "\x85""Adding files mid-game may cause problems."
|
||||
: LOCATIONSTRING));
|
||||
|
||||
if (numwadfiles >= MAX_WADFILES) // difficult to happen with current limits, but still worth thinking of
|
||||
if (!numwadfiles)
|
||||
y = 0;
|
||||
else if (numwadfiles >= MAX_WADFILES) // difficult to happen with current limits, but still worth thinking of
|
||||
y = FRACUNIT;
|
||||
else
|
||||
{
|
||||
y = FixedDiv(((packetsizetally-mainwadstally)<<FRACBITS), (((MAXFILENEEDED*sizeof(UINT8)-mainwadstally)-(5+22))<<FRACBITS)); // 5+22 = (a.ext + checksum length) is minimum addition to packet size tally
|
||||
y = FixedDiv(((packetsizetally-mainwadstally)<<FRACBITS), (((MAXFILENEEDED*sizeof(UINT8)-mainwadstally)-(5+22))<<FRACBITS)) + 1; // 5+22 = (a.ext + checksum length) is minimum addition to packet size tally
|
||||
if (y > FRACUNIT) // happens because of how we're shrinkin' it a little
|
||||
y = FRACUNIT;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue