mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-26 20:11:47 +00:00
compile
This commit is contained in:
parent
b8a752e40a
commit
54066cc9fc
2 changed files with 9 additions and 7 deletions
10
src/k_kart.c
10
src/k_kart.c
|
|
@ -8964,8 +8964,10 @@ static void K_drawKartMinimap(void)
|
||||||
// hu_stuff needs this, unlike st_stuff.
|
// hu_stuff needs this, unlike st_stuff.
|
||||||
if (gamestate != GS_LEVEL)
|
if (gamestate != GS_LEVEL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (stplyr != &players[displayplayer])
|
// Only draw for the first player
|
||||||
|
// Maybe move this somewhere else where this won't be a concern?
|
||||||
|
if (stplyr != &players[displayplayers[0]])
|
||||||
return;
|
return;
|
||||||
|
|
||||||
lumpnum = W_CheckNumForName(va("%sR", G_BuildMapName(gamemap)));
|
lumpnum = W_CheckNumForName(va("%sR", G_BuildMapName(gamemap)));
|
||||||
|
|
@ -9066,7 +9068,7 @@ static void K_drawKartMinimap(void)
|
||||||
if (!players[i].mo || players[i].spectator)
|
if (!players[i].mo || players[i].spectator)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (i != displayplayer || splitscreen)
|
if (i != displayplayers[0] || splitscreen)
|
||||||
{
|
{
|
||||||
if (G_BattleGametype() && players[i].kartstuff[k_bumper] <= 0)
|
if (G_BattleGametype() && players[i].kartstuff[k_bumper] <= 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -9080,7 +9082,7 @@ static void K_drawKartMinimap(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i == displayplayer || i == secondarydisplayplayer || i == thirddisplayplayer || i == fourthdisplayplayer)
|
if (i == displayplayers[0] || i == displayplayers[1] || i == displayplayers[2] || i == displayplayers[3])
|
||||||
{
|
{
|
||||||
// Draw display players on top of everything else
|
// Draw display players on top of everything else
|
||||||
localplayers[numlocalplayers] = i;
|
localplayers[numlocalplayers] = i;
|
||||||
|
|
|
||||||
|
|
@ -6464,9 +6464,9 @@ void P_RunBattleOvertime(void)
|
||||||
{
|
{
|
||||||
UINT8 transparency = tr_trans50;
|
UINT8 transparency = tr_trans50;
|
||||||
|
|
||||||
if (!splitscreen && players[displayplayer].mo)
|
if (!splitscreen && players[displayplayers[0]].mo)
|
||||||
{
|
{
|
||||||
INT32 dist = P_AproxDistance(battleovertime.x-players[displayplayer].mo->x, battleovertime.y-players[displayplayer].mo->y);
|
INT32 dist = P_AproxDistance(battleovertime.x-players[displayplayers[0]].mo->x, battleovertime.y-players[displayplayers[0]].mo->y);
|
||||||
transparency = max(0, NUMTRANSMAPS - ((256 + (dist>>FRACBITS)) / 256));
|
transparency = max(0, NUMTRANSMAPS - ((256 + (dist>>FRACBITS)) / 256));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -7131,7 +7131,7 @@ void P_MobjThinker(mobj_t *mobj)
|
||||||
mobj->x = mobj->target->x;
|
mobj->x = mobj->target->x;
|
||||||
mobj->y = mobj->target->y;
|
mobj->y = mobj->target->y;
|
||||||
|
|
||||||
if (!splitscreen && players[displayplayer].mo)
|
if (!splitscreen && players[displayplayers[0]].mo)
|
||||||
{
|
{
|
||||||
scale = mobj->target->scale + FixedMul(FixedDiv(abs(P_AproxDistance(players[displayplayers[0]].mo->x-mobj->target->x,
|
scale = mobj->target->scale + FixedMul(FixedDiv(abs(P_AproxDistance(players[displayplayers[0]].mo->x-mobj->target->x,
|
||||||
players[displayplayers[0]].mo->y-mobj->target->y)), RING_DIST), mobj->target->scale);
|
players[displayplayers[0]].mo->y-mobj->target->y)), RING_DIST), mobj->target->scale);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue