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

Merge public master

Browse source
This commit is contained in:
Eidolon 2025-03-10 03:05:17 -05:00
commit d33a995db3
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/hardware/hw_draw.c
View file

@ -267,8 +267,8 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
cx = cx1; cx = cx1;
cy = cy1; cy = cy1;
fwidth = cx2 - cx1; fwidth = fmaxf(0.0f, cx2 - cx1);
fheight = cy2 - cy1; fheight = fmaxf(0.0f, cy2 - cy1);
} }
// positions of the cx, cy, are between 0 and vid.width/vid.height now, we need them to be between -1 and 1 // positions of the cx, cy, are between 0 and vid.width/vid.height now, we need them to be between -1 and 1

4
src/p_user.c
View file

@ -1125,7 +1125,7 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
ghost->spriteyoffset = mobj->spriteyoffset; ghost->spriteyoffset = mobj->spriteyoffset;
if (mobj->flags2 & MF2_OBJECTFLIP) if (mobj->flags2 & MF2_OBJECTFLIP)
ghost->flags |= MF2_OBJECTFLIP; ghost->flags2 |= MF2_OBJECTFLIP;
if (!(mobj->flags & MF_DONTENCOREMAP)) if (!(mobj->flags & MF_DONTENCOREMAP))
ghost->flags &= ~MF_DONTENCOREMAP; ghost->flags &= ~MF_DONTENCOREMAP;
@ -1978,9 +1978,7 @@ static void P_3dMovement(player_t *player)
else if (player->onconveyor == 4 && !P_IsObjectOnGround(player->mo)) // Actual conveyor belt else if (player->onconveyor == 4 && !P_IsObjectOnGround(player->mo)) // Actual conveyor belt
player->cmomx = player->cmomy = 0; player->cmomx = player->cmomy = 0;
else if (player->onconveyor != 2 && player->onconveyor != 4 else if (player->onconveyor != 2 && player->onconveyor != 4
#ifdef POLYOBJECTS
&& player->onconveyor != 1 && player->onconveyor != 1
#endif
) )
player->cmomx = player->cmomy = 0; player->cmomx = player->cmomy = 0;