- fixed: APowerup::EndEffect could crash if the item was not owned by a valid player actor.

SVN r2256 (trunk)
This commit is contained in:
Christoph Oelckers 2010-03-29 06:08:22 +00:00
parent 1436f0a4fa
commit 18d58ef1c5

View file

@ -195,7 +195,7 @@ void APowerup::EndEffect ()
{
int colormap = GetSpecialColormap(BlendColor);
if (colormap != NOFIXEDCOLORMAP && Owner->player->fixedcolormap == colormap)
if (colormap != NOFIXEDCOLORMAP && Owner && Owner->player && Owner->player->fixedcolormap == colormap)
{ // only unset if the fixed colormap comes from this item
Owner->player->fixedcolormap = NOFIXEDCOLORMAP;
}