stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-14 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Knuckles in 2D mode attempting to latch onto air when gliding into a slope. Now he just attempts to latch onto the slope directly (which I'll fix another time, if I can figure out how)

Browse source 
(fix for SUGOI's Retro Hill Zone)
This commit is contained in:
Monster Iestyn 2016-09-01 21:21:20 +01:00
parent 21aa444943
commit eae47c9808
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/p_user.c
View file

@ -6976,6 +6976,7 @@ static void P_MovePlayer(player_t *player)
msecnode_t *node; // only place it's being used in P_MovePlayer now msecnode_t *node; // only place it's being used in P_MovePlayer now
fixed_t oldx; fixed_t oldx;
fixed_t oldy; fixed_t oldy;
fixed_t floorz, ceilingz;
oldx = player->mo->x; oldx = player->mo->x;
oldy = player->mo->y; oldy = player->mo->y;
@ -6993,31 +6994,34 @@ static void P_MovePlayer(player_t *player)
if (node->m_sector->ffloors) if (node->m_sector->ffloors)
{ {
ffloor_t *rover; ffloor_t *rover;
fixed_t topheight, bottomheight;
for (rover = node->m_sector->ffloors; rover; rover = rover->next) for (rover = node->m_sector->ffloors; rover; rover = rover->next)
{ {
if (!(rover->flags & FF_EXISTS)) continue; if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER))
continue;
if ((rover->flags & FF_BLOCKPLAYER)) topheight = P_GetFOFTopZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
bottomheight = P_GetFOFBottomZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
if (topheight > player->mo->z && bottomheight < player->mo->z)
{ {
if (*rover->topheight > player->mo->z && *rover->bottomheight < player->mo->z) P_ResetPlayer(player);
{ S_StartSound(player->mo, sfx_s3k4a);
P_ResetPlayer(player); player->climbing = 5;
S_StartSound(player->mo, sfx_s3k4a); player->mo->momx = player->mo->momy = player->mo->momz = 0;
player->climbing = 5; break;
player->mo->momx = player->mo->momy = player->mo->momz = 0;
break;
}
} }
} }
} }
if (player->mo->z+player->mo->height > node->m_sector->ceilingheight floorz = P_GetFloorZ(player->mo, node->m_sector, player->mo->x, player->mo->y, NULL);
ceilingz = P_GetCeilingZ(player->mo, node->m_sector, player->mo->x, player->mo->y, NULL);
if (player->mo->z+player->mo->height > ceilingz
&& node->m_sector->ceilingpic == skyflatnum) && node->m_sector->ceilingpic == skyflatnum)
continue; continue;
if (node->m_sector->floorheight > player->mo->z if (floorz > player->mo->z || ceilingz < player->mo->z)
|| node->m_sector->ceilingheight < player->mo->z)
{ {
P_ResetPlayer(player); P_ResetPlayer(player);
S_StartSound(player->mo, sfx_s3k4a); S_StartSound(player->mo, sfx_s3k4a);