mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-01-05 22:42:54 +00:00
Remove WANTED over players' heads, TARGET wanted player
This commit is contained in:
parent
20fe13deb7
commit
b023b16561
2 changed files with 4 additions and 12 deletions
|
|
@ -261,7 +261,7 @@ void K_DrawTargetTracking(const TargetTracking& target)
|
|||
}
|
||||
}
|
||||
|
||||
bool is_player_tracking_target(const player_t *player = stplyr)
|
||||
bool is_player_tracking_target(player_t *player = stplyr)
|
||||
{
|
||||
if ((gametyperules & (GTR_BUMPERS|GTR_CLOSERPLAYERS)) != (GTR_BUMPERS|GTR_CLOSERPLAYERS))
|
||||
{
|
||||
|
|
@ -292,17 +292,7 @@ bool is_player_tracking_target(const player_t *player = stplyr)
|
|||
return false;
|
||||
}
|
||||
|
||||
if (g_hiscore < 1) // SOMEONE should be scoring
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (player->roundscore < g_hiscore)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
return K_IsPlayerWanted(player);
|
||||
}
|
||||
|
||||
bool is_object_tracking_target(const mobj_t* mobj)
|
||||
|
|
|
|||
|
|
@ -6391,6 +6391,7 @@ static void P_MobjSceneryThink(mobj_t *mobj)
|
|||
numx->destscale = scale;
|
||||
}
|
||||
|
||||
#if 0
|
||||
if (K_IsPlayerWanted(mobj->target->player) && mobj->movecount != 1)
|
||||
{
|
||||
mobj_t *wanted = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_PLAYERWANTED);
|
||||
|
|
@ -6401,6 +6402,7 @@ static void P_MobjSceneryThink(mobj_t *mobj)
|
|||
mobj->movecount = 1;
|
||||
}
|
||||
else if (!K_IsPlayerWanted(mobj->target->player))
|
||||
#endif
|
||||
mobj->movecount = 0;
|
||||
}
|
||||
else
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue