OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Sync scriptbranch with trunk.

Browse source 
SVN r2269 (scripting)
This commit is contained in:
Randy Heit 2010-04-04 04:09:24 +00:00
commit 42ac75e894
127 changed files with 2532 additions and 958 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/info.cpp
View file

@ -460,18 +460,11 @@ PClassActor *PClassActor::GetReplacee(bool lookskill)
void PClassActor::SetDamageFactor(FName type, fixed_t factor)
{
if (factor != FRACUNIT)
if (DamageFactors == NULL)
{
if (DamageFactors == NULL)
{
DamageFactors = new DmgFactors;
}
DamageFactors->Insert(type, factor);
}
else if (DamageFactors != NULL)
{
DamageFactors->Remove(type);
DamageFactors = new DmgFactors;
}
DamageFactors->Insert(type, factor);
}
//==========================================================================
@ -488,7 +481,7 @@ void PClassActor::SetPainChance(FName type, int chance)
{
PainChances = new PainChanceList;
}
PainChances->Insert(type, MIN(chance, 255));
PainChances->Insert(type, MIN(chance, 256));
}
else if (PainChances != NULL)
{
@ -501,6 +494,25 @@ void PClassActor::SetPainChance(FName type, int chance)
//
//==========================================================================
void PClassActor::SetColorSet(int index, const FPlayerColorSet *set)
{
if (set != NULL)
{
if (ColorSets == NULL) ColorSets = new FPlayerColorSetMap;
ColorSets->Insert(index, *set);
}
else
{
if (ColorSets != NULL)
ColorSets->Remove(index);
}
}
//==========================================================================
//
//
//==========================================================================
FDoomEdMap DoomEdMap;
FDoomEdMap::FDoomEdEntry *FDoomEdMap::DoomEdHash[DOOMED_HASHSIZE];
@ -678,4 +690,4 @@ CCMD (summonmbf)
CCMD (summonfoe)
{
SummonActor (DEM_SUMMONFOE, DEM_SUMMONFOE2, argv);
}
}