OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- turned out that the recent change to allow cancelling a powerup blend through a powerup giver did not work well so now there's an explicit 'Powerup.Color none' to do it that works a bit differently.

Browse source
This commit is contained in:
Christoph Oelckers 2014-12-06 22:08:39 +01:00
commit e6de24a7de
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/g_shared/a_artifacts.cpp
View file

@ -60,7 +60,7 @@ bool APowerupGiver::Use (bool pickup)
}
if (BlendColor != 0)
{
if (BlendColor.a != 0) power->BlendColor = BlendColor;
if (BlendColor != MakeSpecialColormap(65535)) power->BlendColor = BlendColor;
else power->BlendColor = 0;
}
if (Mode != NAME_None)