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

Jartha review: Issues with activation and comments of UCRP_WETPLAYER and UCRP_FALLOFF

Browse source
This commit is contained in:
toaster 2023-03-17 13:00:17 +00:00
parent e5f88dd2c6
commit 3ead0d09c4
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/m_cond.c
View file

@ -887,7 +887,7 @@ boolean M_CheckCondition(condition_t *cn, player_t *player)
case UCRP_WETPLAYER: case UCRP_WETPLAYER:
return (((player->roundconditions.wet_player & cn->requirement) == 0) return (((player->roundconditions.wet_player & cn->requirement) == 0)
|| player->roundconditions.fell_off); // Levels with water tend to texture their pits as water too && !player->roundconditions.fell_off); // Levels with water tend to texture their pits as water too
} }
return false; return false;
} }

2
src/m_cond.h
View file

@ -103,7 +103,7 @@ typedef enum
UCRP_LANDMINEDUNK, // huh? you died? that's weird. all i did was try to hug you... UCRP_LANDMINEDUNK, // huh? you died? that's weird. all i did was try to hug you...
UCRP_HITMIDAIR, // Hit another player mid-air with a kartfielditem UCRP_HITMIDAIR, // Hit another player mid-air with a kartfielditem
UCRP_WETPLAYER, // Touch [fluid] UCRP_WETPLAYER, // Don't touch [fluid]
} conditiontype_t; } conditiontype_t;
// Condition Set information // Condition Set information

2
src/p_inter.c
View file

@ -1929,7 +1929,7 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
{ {
case DMG_DEATHPIT: case DMG_DEATHPIT:
// Fell off the stage // Fell off the stage
if (player->roundconditions.fell_off == true) if (player->roundconditions.fell_off == false)
{ {
player->roundconditions.fell_off = true; player->roundconditions.fell_off = true;
player->roundconditions.checkthisframe = true; player->roundconditions.checkthisframe = true;