mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Jartha review: Issues with activation and comments of UCRP_WETPLAYER and UCRP_FALLOFF
This commit is contained in:
parent
e5f88dd2c6
commit
3ead0d09c4
3 changed files with 3 additions and 3 deletions
|
|
@ -887,7 +887,7 @@ boolean M_CheckCondition(condition_t *cn, player_t *player)
|
|||
|
||||
case UCRP_WETPLAYER:
|
||||
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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ typedef enum
|
|||
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_WETPLAYER, // Touch [fluid]
|
||||
UCRP_WETPLAYER, // Don't touch [fluid]
|
||||
} conditiontype_t;
|
||||
|
||||
// Condition Set information
|
||||
|
|
|
|||
|
|
@ -1929,7 +1929,7 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
|
|||
{
|
||||
case DMG_DEATHPIT:
|
||||
// Fell off the stage
|
||||
if (player->roundconditions.fell_off == true)
|
||||
if (player->roundconditions.fell_off == false)
|
||||
{
|
||||
player->roundconditions.fell_off = true;
|
||||
player->roundconditions.checkthisframe = true;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue