OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added a "BlueMap" for powerup colors.

Browse source 
- Add the missing CF_WEAPONREADYALT and CF_WEAPONSWITCHOK flags.

SVN r1723 (trunk)
This commit is contained in:
Randy Heit 2009-07-17 01:17:06 +00:00
commit 720747baef
10 changed files with 42 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/g_shared/a_artifacts.cpp
View file

@ -149,7 +149,8 @@ PalEntry APowerup::GetBlend ()
BlendColor == GOLDCOLOR ||
// [BC] HAX!
BlendColor == REDCOLOR ||
BlendColor == GREENCOLOR)
BlendColor == GREENCOLOR ||
BlendColor == BLUECOLOR)
return 0;
return BlendColor;
@ -199,11 +200,16 @@ void APowerup::DoEffect ()
{
Owner->player->fixedcolormap = GREENCOLORMAP;
}
else if (BlendColor == BLUECOLOR)
{
Owner->player->fixedcolormap = BLUECOLORMAP;
}
}
else if ((BlendColor == INVERSECOLOR && Owner->player->fixedcolormap == INVERSECOLORMAP) ||
(BlendColor == GOLDCOLOR && Owner->player->fixedcolormap == GOLDCOLORMAP) ||
(BlendColor == REDCOLOR && Owner->player->fixedcolormap == REDCOLORMAP) ||
(BlendColor == GREENCOLOR && Owner->player->fixedcolormap == GREENCOLORMAP))
(BlendColor == GREENCOLOR && Owner->player->fixedcolormap == GREENCOLORMAP) ||
(BlendColor == BLUECOLOR && Owner->player->fixedcolormap == BLUECOLORMAP))
{
Owner->player->fixedcolormap = 0;
}