thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Kill SF_RUNONWATER

Browse source
This commit is contained in:
wolfy852 2019-03-06 22:02:56 -06:00
parent 33c85f4813
commit 2850ca17df
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_player.h
View file

@ -38,7 +38,7 @@ typedef enum
SF_HIRES = 1<<3, // Draw the sprite 2x as small? SF_HIRES = 1<<3, // Draw the sprite 2x as small?
SF_NOSKID = 1<<4, // No skid particles etc SF_NOSKID = 1<<4, // No skid particles etc
SF_NOSPEEDADJUST = 1<<5, // Skin-specific version of disablespeedadjust SF_NOSPEEDADJUST = 1<<5, // Skin-specific version of disablespeedadjust
SF_RUNONWATER = 1<<6, // Run on top of water FOFs? //SF_RUNONWATER = 1<<6, // Run on top of water FOFs?
} skinflags_t; } skinflags_t;
//Primary and secondary skin abilities //Primary and secondary skin abilities

2
src/dehacked.c
View file

@ -8614,7 +8614,7 @@ struct {
{"SF_HIRES",SF_HIRES}, {"SF_HIRES",SF_HIRES},
{"SF_NOSKID",SF_NOSKID}, {"SF_NOSKID",SF_NOSKID},
{"SF_NOSPEEDADJUST",SF_NOSPEEDADJUST}, {"SF_NOSPEEDADJUST",SF_NOSPEEDADJUST},
{"SF_RUNONWATER",SF_RUNONWATER}, //{"SF_RUNONWATER",SF_RUNONWATER},
// Character abilities! // Character abilities!
// Primary // Primary

2
src/p_mobj.c
View file

@ -3234,7 +3234,7 @@ boolean P_CanRunOnWater(player_t *player, ffloor_t *rover)
#endif #endif
*rover->topheight; *rover->topheight;
if (((player->charflags & SF_RUNONWATER) && player->mo->ceilingz-topheight >= player->mo->height) if ((/*(player->charflags & SF_RUNONWATER) && */player->mo->ceilingz-topheight >= player->mo->height)
&& (rover->flags & FF_SWIMMABLE) && !(player->pflags & PF_SPINNING) && player->speed > FixedMul(player->runspeed, player->mo->scale) && (rover->flags & FF_SWIMMABLE) && !(player->pflags & PF_SPINNING) && player->speed > FixedMul(player->runspeed, player->mo->scale)
&& !(player->pflags & PF_SLIDING) && !(player->pflags & PF_SLIDING)
&& abs(player->mo->z - topheight) < FixedMul(30*FRACUNIT, player->mo->scale)) && abs(player->mo->z - topheight) < FixedMul(30*FRACUNIT, player->mo->scale))

4
src/r_things.c
View file

@ -3046,8 +3046,8 @@ next_token:
HWR_AddPlayerMD2(numskins); HWR_AddPlayerMD2(numskins);
#endif #endif
if (skin->flags & SF_RUNONWATER) // this is literally the only way a skin can be a major mod... this might be a bit heavy handed /*if (skin->flags & SF_RUNONWATER) // this is literally the only way a skin can be a major mod... this might be a bit heavy handed
G_SetGameModified(multiplayer, true); G_SetGameModified(multiplayer, true);*/
numskins++; numskins++;
} }