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

Fix few poor conflict resolution

Browse source
This commit is contained in:
James R 2020-09-20 14:24:50 -07:00
parent ef108cbb36
commit 7533109dfc
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_main.c
View file

@ -851,7 +851,7 @@ static inline void D_CleanFile(char **filearray)
static boolean AddIWAD(void) static boolean AddIWAD(void)
{ {
char * path = va(pandf,srb2path,"srb2.srb"); char * path = va(pandf,srb2path,"main.kart");
if (FIL_ReadFileOK(path)) if (FIL_ReadFileOK(path))
{ {

12
src/k_kart.c
View file

@ -619,7 +619,6 @@ INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean spbrush,
UINT8 K_FindUseodds(player_t *player, fixed_t mashed, UINT32 pdis, UINT8 bestbumper, boolean spbrush) UINT8 K_FindUseodds(player_t *player, fixed_t mashed, UINT32 pdis, UINT8 bestbumper, boolean spbrush)
{ {
UINT8 i; UINT8 i;
UINT8 n = 0;
UINT8 useodds = 0; UINT8 useodds = 0;
UINT8 disttable[14]; UINT8 disttable[14];
UINT8 distlen = 0; UINT8 distlen = 0;
@ -1346,18 +1345,13 @@ static UINT8 K_CheckOffroadCollide(mobj_t *mo)
*/ */
static void K_UpdateOffroad(player_t *player) static void K_UpdateOffroad(player_t *player)
{ {
fixed_t offroad; fixed_t offroadstrength = (K_CheckOffroadCollide(player->mo) << FRACBITS);
UINT8 offroadstrength = K_CheckOffroadCollide(player->mo);
// If you are in offroad, a timer starts. // If you are in offroad, a timer starts.
if (offroadstrength) if (offroadstrength)
{ {
if (/*K_CheckOffroadCollide(player->mo) &&*/ player->kartstuff[k_offroad] == 0) // With the way offroad is detected now that first check is no longer necessary. -Lat' if (player->kartstuff[k_offroad] < offroadstrength)
player->kartstuff[k_offroad] = (TICRATE/2); player->kartstuff[k_offroad] += offroadstrength / TICRATE;
if (player->kartstuff[k_offroad] > 0)
{
offroad = (offroadstrength << FRACBITS) / (TICRATE/2);
if (player->kartstuff[k_offroad] > offroadstrength) if (player->kartstuff[k_offroad] > offroadstrength)
player->kartstuff[k_offroad] = offroadstrength; player->kartstuff[k_offroad] = offroadstrength;