- Added Karate Chris's patch for teamplay MAPINFO option.

- Added Karate Chris's patch for custom damage color per player class.
- Added Karate Chris's patch for respawnlimit skill property.
- Added Karate Chris's patch for Strife quit messages.
- Fixed: P_RailAttack ignored the puff's damage type.


SVN r714 (trunk)
This commit is contained in:
Christoph Oelckers 2008-01-26 16:42:16 +00:00
commit 58816f5d09
13 changed files with 117 additions and 17 deletions

View file

@ -281,6 +281,7 @@ void AActor::Serialize (FArchive &arc)
<< player
<< SpawnPoint[0] << SpawnPoint[1] << SpawnPoint[2]
<< SpawnAngle
<< skillrespawncount
<< tracer
<< floorclip
<< tid
@ -2182,6 +2183,8 @@ void P_NightmareRespawn (AActor *mobj)
AActor *mo;
AActor *info = mobj->GetDefault();
mobj->skillrespawncount++;
// spawn the new monster (assume the spawn will be good)
if (info->flags & MF_SPAWNCEILING)
z = ONCEILINGZ;
@ -2226,6 +2229,8 @@ void P_NightmareRespawn (AActor *mobj)
mo->CopyFriendliness (mobj, false);
mo->Translation = mobj->Translation;
mo->skillrespawncount = mobj->skillrespawncount;
// spawn a teleport fog at old spot because of removal of the body?
mo = Spawn ("TeleportFog", mobj->x, mobj->y, mobj->z, ALLOW_REPLACE);
if (mo != NULL)
@ -2970,6 +2975,9 @@ void AActor::Tick ()
if (pr_nightmarerespawn() > 4)
return;
if (G_SkillProperty (SKILLP_RespawnLimit) && (this)->skillrespawncount >= G_SkillProperty (SKILLP_RespawnLimit))
return;
P_NightmareRespawn (this);
}
}