diff --git a/src/p_mobj.c b/src/p_mobj.c index f390d34cd..42f927064 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10210,6 +10210,7 @@ void P_SpawnPrecipitation(void) // Not in a sector with visible sky? if (precipsector->sector->ceilingpic != skyflatnum) continue; + // Exists, but is too small for reasonable precipitation. if (!(precipsector->sector->floorheight <= precipsector->sector->ceilingheight - (32<>(FRACBITS+2)); } - if (volume < 0) - volume = 0; - else if (volume > 255) - volume = 255; + volume = CLAMP(volume, 0, 255); if (sounds_rain && (!leveltime || leveltime % 80 == 1)) S_StartSoundAtVolume(players[displayplayers[0]].mo, sfx_rainin, volume); diff --git a/src/p_spec.c b/src/p_spec.c index 65ae7ae6f..d94e2a797 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -5220,6 +5220,8 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate) curWeather = PRECIP_STORM_NORAIN; else if (mapheaderinfo[gamemap-1]->weather == 6) // storm w/o lightning curWeather = PRECIP_STORM_NOSTRIKES; + else if (mapheaderinfo[gamemap-1]->weather == 4) // blank + curWeather = PRECIP_BLANK; else curWeather = PRECIP_NONE;