diff options
| author | enneract <trem.redman@gmail.com> | 2015-01-08 00:42:15 +0100 |
|---|---|---|
| committer | enneract <trem.redman@gmail.com> | 2015-01-08 00:42:15 +0100 |
| commit | 96bede71e66823dc28a57935e48e4cc7b17f55af (patch) | |
| tree | 26dbd475a40bdf1d3412d5a7d5c9ad23a16c8bd5 /src/game/g_admin.c | |
| parent | 96f8e06ec9aa117bb8dd7e8d671d93e3884cb98f (diff) | |
Fix various linking errors and segfaults.
Diffstat (limited to 'src/game/g_admin.c')
| -rw-r--r-- | src/game/g_admin.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/game/g_admin.c b/src/game/g_admin.c index b6e115b..6beac1c 100644 --- a/src/game/g_admin.c +++ b/src/game/g_admin.c @@ -3421,7 +3421,7 @@ qboolean G_admin_score_info( gentity_t *ent ) char name[ MAX_NAME_LENGTH ]; g_admin_admin_t *target; namelog_t *match; - int newscore; + int newscore = 0; if( trap_Argc() < 2 ) { @@ -3704,7 +3704,6 @@ static char *fates[] = qboolean G_admin_slap( gentity_t *ent ) { - int pids[ MAX_CLIENTS ]; int pid; char name[ MAX_NAME_LENGTH ], *reason, err[ MAX_STRING_CHARS ]; int minargc; @@ -3763,12 +3762,12 @@ qboolean G_admin_slap( gentity_t *ent ) if( vic->health <= 1 ) { vic->flags |= FL_NO_KNOCKBACK; - vic->enemy = &g_entities[ pids[ 0 ] ]; + vic->enemy = ent; vic->die( vic, ent, ent, 25, MOD_SLAP ); } else if( vic->pain ) { - vic->pain( vic, &g_entities[ pids[ 0 ] ], 2 ); + vic->pain( vic, ent, 2 ); } return qtrue; |