thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rewrite K_BotHatesThisSector slightly

Browse source 
Fixed a lot of its false positives, as well as some copy-paste errors
This commit is contained in:
Sally Coolatta 2020-05-28 17:58:35 -04:00
parent fdb13b76d1
commit 896c6b3952
1 changed files with 66 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
src/k_botsearch.c
View file

@ -25,6 +25,7 @@
#include "d_ticcmd.h" #include "d_ticcmd.h"
#include "m_random.h" #include "m_random.h"
#include "r_things.h" // numskins #include "r_things.h" // numskins
#include "p_slopes.h" // P_GetZAt
struct globalsmuggle struct globalsmuggle
{ {
@ -156,64 +157,99 @@ static boolean K_BotHatesThisSectorsSpecial(player_t *player, sector_t *sec)
} }
/*-------------------------------------------------- /*--------------------------------------------------
static boolean K_BotHatesThisSector(player_t *player, sector_t *sec) static boolean K_BotHatesThisSector(player_t *player, sector_t *sec, fixed_t x, fixed_t y)
Tells us if a bot will play more careful around Tells us if a bot will play more careful around
this sector. this sector. Checks FOFs in the sector, as well.
Input Arguments:- Input Arguments:-
player - Player to check against. player - Player to check against.
sec - Sector to check against. sec - Sector to check against.
x - Linedef cross X position, for slopes
y - Linedef cross Y position, for slopes
Return:- Return:-
true if avoiding this sector, false otherwise. true if avoiding this sector, false otherwise.
--------------------------------------------------*/ --------------------------------------------------*/
static boolean K_BotHatesThisSector(player_t *player, sector_t *sec) static boolean K_BotHatesThisSector(player_t *player, sector_t *sec, fixed_t x, fixed_t y)
{ {
const boolean flip = (player->mo->eflags & MFE_VERTICALFLIP); const boolean flip = (player->mo->eflags & MFE_VERTICALFLIP);
INT32 flag; INT32 specialflag = 0;
fixed_t highestfloor = INT32_MAX;
sector_t *bestsector = NULL;
ffloor_t *rover; ffloor_t *rover;
if (flip) if (flip == true)
{ {
flag = SF_FLIPSPECIAL_CEILING; specialflag = SF_FLIPSPECIAL_CEILING;
highestfloor = (sec->c_slope ? P_GetZAt(sec->c_slope, x, y) : sec->ceilingheight);
} }
else else
{ {
flag = SF_FLIPSPECIAL_FLOOR; specialflag = SF_FLIPSPECIAL_FLOOR;
highestfloor = (sec->f_slope ? P_GetZAt(sec->f_slope, x, y) : sec->floorheight);
} }
if (sec->flags & flag) if (sec->flags & specialflag)
{ {
if (K_BotHatesThisSectorsSpecial(player, sec)) bestsector = sec;
{
return true;
}
} }
for (rover = sec->ffloors; rover; rover = rover->next) for (rover = sec->ffloors; rover; rover = rover->next)
{ {
fixed_t top = INT32_MAX;
fixed_t bottom = INT32_MAX;
if (!(rover->flags & FF_EXISTS)) if (!(rover->flags & FF_EXISTS))
{ {
continue; continue;
} }
if (!(rover->master->frontsector->flags & flag)) top = (*rover->t_slope ? P_GetZAt(*rover->t_slope, x, y) : *rover->topheight);
bottom = (*rover->b_slope ? P_GetZAt(*rover->b_slope, x, y) : *rover->bottomheight);
if (!(rover->flags & FF_BLOCKPLAYER))
{
if ((top >= player->mo->z) && (bottom <= player->mo->z + player->mo->height)
&& K_BotHatesThisSectorsSpecial(player, rover->master->frontsector))
{
// Bad intangible sector at our height, so we DEFINITELY want to avoid
return true;
}
}
if ((rover->flags & FF_BLOCKPLAYER) && !(rover->master->frontsector->flags & specialflag))
{ {
continue; continue;
} }
if (((*rover->bottomheight >= player->mo->z + player->mo->height) && (flip)) // Find the highest FOF floor beneath the player, and check it at the end.
|| ((*rover->topheight <= player->mo->z) && (!flip))) if (flip == true)
{ {
if (K_BotHatesThisSectorsSpecial(player, sec)) if (bottom < highestfloor
&& bottom >= player->mo->z + player->mo->height)
{ {
return true; bestsector = rover->master->frontsector;
highestfloor = bottom;
}
}
else
{
if (top > highestfloor
&& top <= player->mo->z)
{
bestsector = rover->master->frontsector;
highestfloor = top;
} }
} }
} }
return false; if (bestsector == NULL)
{
return false;
}
return K_BotHatesThisSectorsSpecial(player, bestsector);
} }
/*-------------------------------------------------- /*--------------------------------------------------
@ -236,6 +272,7 @@ static boolean K_FindBlockingWalls(line_t *line)
fixed_t maxstep = maxstepmove; fixed_t maxstep = maxstepmove;
fixed_t linedist = INT32_MAX; fixed_t linedist = INT32_MAX;
INT32 lineside = 0; INT32 lineside = 0;
vertex_t pos;
if (!globalsmuggle.botmo || P_MobjWasRemoved(globalsmuggle.botmo) || !globalsmuggle.botmo->player) if (!globalsmuggle.botmo || P_MobjWasRemoved(globalsmuggle.botmo) || !globalsmuggle.botmo->player)
{ {
@ -295,20 +332,18 @@ static boolean K_FindBlockingWalls(line_t *line)
goto blocked; goto blocked;
} }
if (!K_BotHatesThisSector(globalsmuggle.botmo->player, globalsmuggle.botmo->subsector->sector)) // Treat damage sectors like walls
{ P_ClosestPointOnLine(globalsmuggle.botmo->x, globalsmuggle.botmo->y, line, &pos);
// Treat damage sectors like walls
if (lineside) if (lineside)
{ {
if (K_BotHatesThisSector(globalsmuggle.botmo->player, line->frontsector)) if (K_BotHatesThisSector(globalsmuggle.botmo->player, line->frontsector, pos.x, pos.y))
goto blocked; goto blocked;
} }
else else
{ {
if (K_BotHatesThisSector(globalsmuggle.botmo->player, line->backsector)) if (K_BotHatesThisSector(globalsmuggle.botmo->player, line->backsector, pos.x, pos.y))
goto blocked; goto blocked;
}
} }
// We weren't blocked! // We weren't blocked!