OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: Pain flashes were not inheritable.

Browse source 
SVN r3779 (trunk)
This commit is contained in:
Randy Heit 2012-07-21 02:58:52 +00:00
commit d2843c199e
3 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/info.cpp
View file

@ -329,6 +329,32 @@ void FActorInfo::SetPainFlash(FName type, PalEntry color)
//
//==========================================================================
bool FActorInfo::GetPainFlash(FName type, PalEntry *color) const
{
const FActorInfo *info = this;
while (info != NULL)
{
if (info->PainFlashes != NULL)
{
PalEntry *flash = info->PainFlashes->CheckKey(type);
if (flash != NULL)
{
*color = *flash;
return true;
}
}
// Try parent class
info = info->Class->ParentClass->ActorInfo;
}
return false;
}
//==========================================================================
//
//
//==========================================================================
void FActorInfo::SetColorSet(int index, const FPlayerColorSet *set)
{
if (set != NULL)