diff --git a/src/g_chase.c b/src/g_chase.c index de3a24c..b71fbfe 100644 --- a/src/g_chase.c +++ b/src/g_chase.c @@ -34,7 +34,6 @@ UpdateChaseCam(edict_t *ent) vec3_t forward, right; trace_t trace; int i; - vec3_t oldgoal; vec3_t angles; /* is our chase target gone? */ @@ -47,10 +46,7 @@ UpdateChaseCam(edict_t *ent) targ = ent->client->chase_target; VectorCopy(targ->s.origin, ownerv); - VectorCopy(ent->s.origin, oldgoal); - ownerv[2] += targ->viewheight; - VectorCopy(targ->client->v_angle, angles); if (angles[PITCH] > 56) diff --git a/src/g_func.c b/src/g_func.c index 393a236..c8bf77f 100644 --- a/src/g_func.c +++ b/src/g_func.c @@ -484,10 +484,7 @@ plat_blocked(edict_t *self, edict_t *other) if (other) { /* Hack for entity without it's origin near the model */ - vec3_t save; - VectorCopy(other->s.origin, save); VectorMA(other->absmin, 0.5, other->size, other->s.origin); - BecomeExplosion1(other); } @@ -1394,10 +1391,7 @@ door_blocked(edict_t *self, edict_t *other) if (other) { /* Hack for entitiy without their origin near the model */ - vec3_t save; - VectorCopy(other->s.origin, save); VectorMA(other->absmin, 0.5, other->size, other->s.origin); - BecomeExplosion1(other); } @@ -1881,10 +1875,7 @@ train_blocked(edict_t *self, edict_t *other) if (other) { /* Hack for entity without an origin near the model */ - vec3_t save; - VectorCopy(other->s.origin, save); VectorMA(other->absmin, 0.5, other->size, other->s.origin); - BecomeExplosion1(other); } @@ -2454,10 +2445,7 @@ door_secret_blocked(edict_t *self, edict_t *other) if (other) { /* Hack for entities without their origin near the model */ - vec3_t save; - VectorCopy(other->s.origin, save); VectorMA(other->absmin, 0.5, other->size, other->s.origin); - BecomeExplosion1(other); } diff --git a/src/g_phys.c b/src/g_phys.c index 98a5af4..567c747 100644 --- a/src/g_phys.c +++ b/src/g_phys.c @@ -539,7 +539,6 @@ SV_Push(edict_t *pusher, vec3_t move, vec3_t amove) { int i, e; edict_t *check, *block; - vec3_t mins, maxs; pushed_t *p; vec3_t org, org2, move2, forward, right, up; vec3_t realmins, realmaxs; @@ -563,13 +562,6 @@ SV_Push(edict_t *pusher, vec3_t move, vec3_t amove) move[i] = 0.125 * (int)temp; } - /* find the bounding box */ - for (i = 0; i < 3; i++) - { - mins[i] = pusher->absmin[i] + move[i]; - maxs[i] = pusher->absmax[i] + move[i]; - } - /* we need this for pushing things later */ VectorSubtract(vec3_origin, amove, org); AngleVectors(org, forward, right, up); diff --git a/src/g_target.c b/src/g_target.c index c15a941..2dddf06 100644 --- a/src/g_target.c +++ b/src/g_target.c @@ -523,21 +523,6 @@ SP_target_spawner(edict_t *self) void use_target_blaster(edict_t *self, edict_t *other, edict_t *activator) { - int effect; - - if (self->spawnflags & 2) - { - effect = 0; - } - else if (self->spawnflags & 1) - { - effect = EF_HYPERBLASTER; - } - else - { - effect = EF_BLASTER; - } - fire_blaster(self, self->s.origin, self->movedir, self->dmg, self->speed, EF_BLASTER, MOD_TARGET_BLASTER); gi.sound(self, CHAN_VOICE, self->noise_index, 1, ATTN_NORM, 0); diff --git a/src/player/hud.c b/src/player/hud.c index 4432a8b..7bd7f4b 100644 --- a/src/player/hud.c +++ b/src/player/hud.c @@ -206,7 +206,6 @@ DeathmatchScoreboardMessage(edict_t *ent, edict_t *killer) int sorted[MAX_CLIENTS]; int sortedscores[MAX_CLIENTS]; int score, total; - int picnum; int x, y; gclient_t *cl; edict_t *cl_ent; @@ -267,7 +266,6 @@ DeathmatchScoreboardMessage(edict_t *ent, edict_t *killer) cl = &game.clients[sorted[i]]; cl_ent = g_edicts + 1 + sorted[i]; - picnum = gi.imageindex("i_fixme"); x = (i >= 6) ? 160 : 0; y = 32 + 32 * (i % 6);