diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 0723d38..1486446 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -222,8 +222,16 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int if( meansOfDeath == MOD_SLAP ) { if( self == attacker || !attacker ) + { + if( g_slapKnockback.integer ){ trap_SendServerCommand( -1, va( "print \"%s^7 slapped themself silly\n\"", self->client->pers.netname ) ); + } + else { + trap_SendServerCommand( -1, va( "print \"%s^7 suffered a heart attck\n\"", + self->client->pers.netname )); + } + } else trap_SendServerCommand( -1, va( "print \"%s^7 felt %s^7's authoritay\n\"", @@ -257,7 +265,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int if ( meansOfDeath == MOD_RADIATION ) trap_SendServerCommand( -1, va( "print \"%s^7 was irradiated by his base\n\"", self->client->pers.netname ) ); else if ( meansOfDeath == MOD_LEVEL2_CLAW ) - trap_SendServerCommand( -1, va( "print \"%s^7 bit off %s's face\n\"", attacker->client->pers.netname, self->client->pers.netname ) ); + trap_SendServerCommand( -1, va( "print \"%s^7 bit off %s^7's face\n\"", attacker->client->pers.netname, self->client->pers.netname ) ); else { ent = G_TempEntity( self->r.currentOrigin, EV_OBITUARY ); diff --git a/src/game/g_main.c b/src/game/g_main.c index c7df903..e80f14d 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "g_local.h" #define QVM_VARIANT "P-G-QVM" -#define QVM_VERSION "SVN r68" +#define QVM_VERSION "SVN r69" level_locals_t level;