Merge branch 'master' into userlights

This commit is contained in:
Christoph Oelckers 2019-07-07 08:11:09 +02:00
commit 5df8919b90
37 changed files with 173 additions and 163 deletions

View file

@ -4262,11 +4262,12 @@ void AActor::SplashCheck()
bool AActor::UpdateWaterLevel(bool dosplash)
{
int oldlevel = waterlevel;
if (dosplash) SplashCheck();
double fh = -FLT_MAX;
bool reset = false;
int oldlevel = waterlevel;
waterlevel = 0;