From 7acbb8c9568c36d2bc7f420c9ba2bdca79164509 Mon Sep 17 00:00:00 2001 From: Paradox460 Date: Sat, 5 Jan 2008 05:45:34 +0000 Subject: [PATCH] Fixed message shown when pause runs without arguments Fixed grammar on self !slaps obituary Changed !explode obituary to be a bit funnier Fixed banned player tried to connect message for admin chat ban number --- src/game/g_admin.c | 4 ++-- src/game/g_combat.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/g_admin.c b/src/game/g_admin.c index e7c94b2..d593f11 100644 --- a/src/game/g_admin.c +++ b/src/game/g_admin.c @@ -1164,7 +1164,7 @@ qboolean G_admin_ban_check( char *userinfo, char *reason, int rlen ) "Banned player %s^7 (%s) tried to connnect (ban #%i by %s^7 expires %s reason: %s^7 )", Info_ValueForKey( userinfo, "name" ), g_admin_bans[ i ]->name, - i, + i+1, g_admin_bans[ i ]->banner, duration, g_admin_bans[ i ]->reason @@ -4143,7 +4143,7 @@ qboolean G_admin_pause( gentity_t *ent, int skiparg ) } else if( G_SayArgc() > 2 + skiparg ) { - ADMP( va( "^3!%s: ^7usage: ^3!%s ^7(^5name|slot^7)\n", cmd, cmd ) ); + ADMP( va( "^3!pause: ^7usage: ^7(^5name|slot^7)\n", cmd, cmd ) ); return qfalse; } for( i = 0; pids[ i ] >= 0; i++ ) diff --git a/src/game/g_combat.c b/src/game/g_combat.c index dd777d9..17f2ccf 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -210,7 +210,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int if( meansOfDeath == MOD_SLAP ) { if( self == attacker || !attacker ) - trap_SendServerCommand( -1, va( "print \"%s^7 slapped themselves silly\n\"", + trap_SendServerCommand( -1, va( "print \"%s^7 slapped themself silly\n\"", self->client->pers.netname ) ); else trap_SendServerCommand( -1, @@ -225,7 +225,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int else if( meansOfDeath == MOD_EXPLODE ) { if( self == attacker || !attacker ) - trap_SendServerCommand( -1, va( "print \"%s^7 blew up.\n\"", + trap_SendServerCommand( -1, va( "print \"%s^7 blew up in a firey death.\n\"", self->client->pers.netname ) ); else trap_SendServerCommand( -1,