OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: Monsters should never target friends, even if the friendliness

Browse source 
state has changed since the target has been acquired.
- Fixed: Multiplayer telefrag obituaries must be handled before weapon
  dependent obituary messages.


SVN r341 (trunk)
This commit is contained in:
Christoph Oelckers 2006-09-28 07:37:19 +00:00
commit a3f39c3789
4 changed files with 66 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/p_interaction.cpp
View file

@ -273,25 +273,28 @@ void ClientObituary (AActor *self, AActor *inflictor, AActor *attacker)
}
else
{
if (inflictor != NULL)
{
message = inflictor->GetClass()->Meta.GetMetaString (AMETA_Obituary);
}
if (message == NULL && attacker->player->ReadyWeapon != NULL)
{
message = attacker->player->ReadyWeapon->GetClass()->Meta.GetMetaString (AMETA_Obituary);
}
if (mod == MOD_TELEFRAG) message = GStrings("OB_MPTELEFRAG");
if (message == NULL)
{
switch (mod)
if (inflictor != NULL)
{
case MOD_R_SPLASH: messagename = "OB_MPR_SPLASH"; break;
case MOD_BFG_SPLASH: messagename = "OB_MPBFG_SPLASH"; break;
case MOD_TELEFRAG: messagename = "OB_MPTELEFRAG"; break;
case MOD_RAILGUN: messagename = "OB_RAILGUN"; break;
message = inflictor->GetClass()->Meta.GetMetaString (AMETA_Obituary);
}
if (message == NULL && attacker->player->ReadyWeapon != NULL)
{
message = attacker->player->ReadyWeapon->GetClass()->Meta.GetMetaString (AMETA_Obituary);
}
if (message == NULL)
{
switch (mod)
{
case MOD_R_SPLASH: messagename = "OB_MPR_SPLASH"; break;
case MOD_BFG_SPLASH: messagename = "OB_MPBFG_SPLASH"; break;
case MOD_RAILGUN: messagename = "OB_RAILGUN"; break;
}
if (messagename != NULL)
message = GStrings(messagename);
}
if (messagename != NULL)
message = GStrings(messagename);
}
}
}