OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Sync with trunk.

Browse source 
SVN r1872 (scripting)
This commit is contained in:
Randy Heit 2009-09-23 00:24:47 +00:00
commit 1a442742f7
167 changed files with 1885 additions and 2340 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/p_lnspec.cpp
View file

@ -2532,7 +2532,10 @@ FUNC(LS_SetPlayerProperty)
if (power != 4)
{
APowerup *item = static_cast<APowerup*>(it->GiveInventoryType (*powers[power]));
if (item != NULL && power == 0) item->BlendColor = INVERSECOLOR;
if (item != NULL && power == 0 && arg1 == 1)
{
item->BlendColor = MakeSpecialColormap(INVERSECOLORMAP);
}
}
else if (it->player - players == consoleplayer)
{
@ -2568,7 +2571,11 @@ FUNC(LS_SetPlayerProperty)
{ // Give power
if (power != 4)
{
players[i].mo->GiveInventoryType (*powers[power]);
APowerup *item = static_cast<APowerup*>(players[i].mo->GiveInventoryType (*powers[power]));
if (item != NULL && power == 0 && arg1 == 1)
{
item->BlendColor = MakeSpecialColormap(INVERSECOLORMAP);
}
}
else if (i == consoleplayer)
{