mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-22 04:21:23 +00:00
Fix faulty comparison
Logical comparisons evaluate to a boolean value...
This commit is contained in:
parent
fec5f2778e
commit
923e6f31aa
1 changed files with 18 additions and 2 deletions
20
src/p_spec.c
20
src/p_spec.c
|
@ -1981,6 +1981,22 @@ void P_LinedefExecute(INT16 tag, mobj_t *actor, sector_t *caller)
|
|||
}
|
||||
}
|
||||
|
||||
static boolean is_rain_type (INT32 weathernum)
|
||||
{
|
||||
switch (weathernum)
|
||||
{
|
||||
case PRECIP_SNOW:
|
||||
case PRECIP_RAIN:
|
||||
case PRECIP_STORM:
|
||||
case PRECIP_STORM_NOSTRIKES:
|
||||
case PRECIP_BLANK:
|
||||
return true;
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// P_SwitchWeather
|
||||
//
|
||||
|
@ -1989,12 +2005,12 @@ void P_LinedefExecute(INT16 tag, mobj_t *actor, sector_t *caller)
|
|||
void P_SwitchWeather(INT32 weathernum)
|
||||
{
|
||||
boolean purge = true;
|
||||
boolean raintype = (PRECIP_SNOW || PRECIP_RAIN || PRECIP_STORM || PRECIP_STORM_NOSTRIKES || PRECIP_BLANK);
|
||||
|
||||
if (weathernum == curWeather)
|
||||
return;
|
||||
|
||||
if (weathernum == raintype && curWeather == raintype)
|
||||
if (is_rain_type(weathernum) &&
|
||||
is_rain_type(curWeather))
|
||||
purge = false;
|
||||
|
||||
if (purge)
|
||||
|
|
Loading…
Reference in a new issue