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

6
src/d_dehacked.cpp
View file

@ -1793,7 +1793,7 @@ static int PatchMisc (int dummy)
{
Printf ("Bad powerup color description \"%s\" for %s\n", Line2, Line1);
}
else
else if (a > 0)
{
static_cast<APowerup *>(GetDefaultByType (*types[i]))->BlendColor = PalEntry(
BYTE(clamp(a,0.f,1.f)*255.f),
@ -1801,6 +1801,10 @@ static int PatchMisc (int dummy)
clamp(g,0,255),
clamp(b,0,255));
}
else
{
static_cast<APowerup *>(GetDefaultByType (*types[i]))->BlendColor = 0;
}
}
}
else