diff --git a/code/cgame/cg_event.c b/code/cgame/cg_event.c index b93c975..30e3fc3 100644 --- a/code/cgame/cg_event.c +++ b/code/cgame/cg_event.c @@ -320,37 +320,67 @@ static void CG_Obituary( entityState_t *ent ) { message = "was machinegunned by"; break; case MOD_SHOTGUN: - message = "was gunned down by"; + if (r == 0) { + message = "was gunned down by"; + } else if (r == 1) { + message = "was splattered by"; + message2 = "'s shotgun"; + } else if (r == 2) { + message = "chewed on"; + message2 = "'s boomstick"; + } break; case MOD_GRENADE: - message = "ate"; - message2 = "'s grenade"; - break; case MOD_GRENADE_SPLASH: - message = "was shredded by"; - message2 = "'s shrapnel"; + if (r == 0) { + message = "ate"; + message2 = "'s grenade"; + } else if (r == 1) { + message = "was popped by"; + message2 = "'s grenade"; + } else if (r == 2) { + message = "ate"; + message2 = "'s pineapple"; + } break; case MOD_ROCKET: - message = "ate"; - message2 = "'s rocket"; - break; case MOD_ROCKET_SPLASH: - message = "almost dodged"; - message2 = "'s rocket"; + if (r == 0) { + message = "was blown apart by"; + message2 = "'s rocket"; + } else if (r == 1) { + message = "almost dodged"; + message2 = "'s rocket"; + } else if (r == 2) { + message = "was doomed by"; + message2 = "'s rocket"; + } break; case MOD_PLASMA: - message = "was melted by"; - message2 = "'s plasmagun"; - break; case MOD_PLASMA_SPLASH: - message = "was melted by"; - message2 = "'s plasmagun"; + if (r == 0) { + message = "was melted by"; + message2 = "'s plasmagun"; + } else if (r == 1) { + message = "was fried by"; + message2 = "'s plasmagun"; + } else if (r == 2) { + message = "was burned by"; + message2 = "'s blue-hot plasma"; + } break; case MOD_RAILGUN: message = "was railed by"; break; case MOD_LIGHTNING: - message = "was electrocuted by"; + if (r == 0) { + message = "was electrocuted by"; + } else if (r == 1) { + message = "was shafted by"; + } else if (r == 2) { + message = "accepted"; + message2 = "'s shaft"; + } break; case MOD_BFG: case MOD_BFG_SPLASH: @@ -361,8 +391,14 @@ static void CG_Obituary( entityState_t *ent ) { message = "was nailed by"; break; case MOD_CHAINGUN: - message = "got lead poisoning from"; - message2 = "'s Chaingun"; + if (r == 0) { + message = "got lead poisoning from"; + message2 = "'s Chaingun"; + } else if (r == 1) { + message = "was mowed down by"; + } else if (r == 2) { + message = "was cut to ribbons by"; + } break; case MOD_PROXIMITY_MINE: message = "was too close to";