From 18d58ef1c5dfdb42001307bbc18e088197b9ed82 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 29 Mar 2010 06:08:22 +0000 Subject: [PATCH] - fixed: APowerup::EndEffect could crash if the item was not owned by a valid player actor. SVN r2256 (trunk) --- src/g_shared/a_artifacts.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/g_shared/a_artifacts.cpp b/src/g_shared/a_artifacts.cpp index 49971acd8..304c9059e 100644 --- a/src/g_shared/a_artifacts.cpp +++ b/src/g_shared/a_artifacts.cpp @@ -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; }