mirror of
https://github.com/yquake2/xatrix.git
synced 2024-11-10 06:42:22 +00:00
Remove several dead assignements
This commit is contained in:
parent
aed38232d3
commit
0226b07f48
9 changed files with 2 additions and 39 deletions
|
@ -113,8 +113,6 @@ SpawnDamage
|
|||
*/
|
||||
void SpawnDamage (int type, vec3_t origin, vec3_t normal, int damage)
|
||||
{
|
||||
if (damage > 255)
|
||||
damage = 255;
|
||||
gi.WriteByte (svc_temp_entity);
|
||||
gi.WriteByte (type);
|
||||
gi.WritePosition (origin);
|
||||
|
|
|
@ -79,12 +79,6 @@ void dabeam_hit (edict_t *self)
|
|||
vec3_t start;
|
||||
vec3_t end;
|
||||
trace_t tr;
|
||||
int count;
|
||||
|
||||
if (self->spawnflags & 0x80000000)
|
||||
count = 8;
|
||||
else
|
||||
count = 4;
|
||||
|
||||
ignore = self;
|
||||
VectorCopy (self->s.origin, start);
|
||||
|
|
|
@ -396,15 +396,6 @@ speed default is 1000
|
|||
|
||||
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);
|
||||
}
|
||||
|
|
|
@ -479,7 +479,6 @@ qboolean Boss2_CheckAttack (edict_t *self)
|
|||
vec3_t temp;
|
||||
float chance;
|
||||
trace_t tr;
|
||||
qboolean enemy_infront;
|
||||
int enemy_range;
|
||||
float enemy_yaw;
|
||||
|
||||
|
@ -498,7 +497,6 @@ qboolean Boss2_CheckAttack (edict_t *self)
|
|||
return false;
|
||||
}
|
||||
|
||||
enemy_infront = infront(self, self->enemy);
|
||||
enemy_range = range(self, self->enemy);
|
||||
VectorSubtract (self->enemy->s.origin, self->s.origin, temp);
|
||||
enemy_yaw = vectoyaw(temp);
|
||||
|
|
|
@ -512,10 +512,8 @@ void jorg_firebullet (edict_t *self)
|
|||
void jorg_attack(edict_t *self)
|
||||
{
|
||||
vec3_t vec;
|
||||
float range;
|
||||
|
||||
VectorSubtract (self->enemy->s.origin, self->s.origin, vec);
|
||||
range = VectorLength (vec);
|
||||
|
||||
if (random() <= 0.75)
|
||||
{
|
||||
|
@ -551,7 +549,6 @@ qboolean Jorg_CheckAttack (edict_t *self)
|
|||
vec3_t temp;
|
||||
float chance;
|
||||
trace_t tr;
|
||||
qboolean enemy_infront;
|
||||
int enemy_range;
|
||||
float enemy_yaw;
|
||||
|
||||
|
@ -570,7 +567,6 @@ qboolean Jorg_CheckAttack (edict_t *self)
|
|||
return false;
|
||||
}
|
||||
|
||||
enemy_infront = infront(self, self->enemy);
|
||||
enemy_range = range(self, self->enemy);
|
||||
VectorSubtract (self->enemy->s.origin, self->s.origin, temp);
|
||||
enemy_yaw = vectoyaw(temp);
|
||||
|
|
|
@ -589,14 +589,11 @@ void makron_sight(edict_t *self, edict_t *other)
|
|||
void makron_attack(edict_t *self)
|
||||
{
|
||||
vec3_t vec;
|
||||
float range;
|
||||
float r;
|
||||
|
||||
r = random();
|
||||
|
||||
VectorSubtract (self->enemy->s.origin, self->s.origin, vec);
|
||||
range = VectorLength (vec);
|
||||
|
||||
|
||||
if (r <= 0.3)
|
||||
self->monsterinfo.currentmove = &makron_move_attack3;
|
||||
|
@ -697,7 +694,6 @@ qboolean Makron_CheckAttack (edict_t *self)
|
|||
vec3_t temp;
|
||||
float chance;
|
||||
trace_t tr;
|
||||
qboolean enemy_infront;
|
||||
int enemy_range;
|
||||
float enemy_yaw;
|
||||
|
||||
|
@ -716,7 +712,6 @@ qboolean Makron_CheckAttack (edict_t *self)
|
|||
return false;
|
||||
}
|
||||
|
||||
enemy_infront = infront(self, self->enemy);
|
||||
enemy_range = range(self, self->enemy);
|
||||
VectorSubtract (self->enemy->s.origin, self->s.origin, temp);
|
||||
enemy_yaw = vectoyaw(temp);
|
||||
|
|
|
@ -212,7 +212,7 @@ void roam_goal (edict_t *self)
|
|||
vec3_t end;
|
||||
edict_t *ent;
|
||||
vec3_t dang;
|
||||
int len, oldlen, whichi, i;
|
||||
int len, oldlen, i;
|
||||
vec3_t vec;
|
||||
vec3_t whichvec;
|
||||
|
||||
|
@ -227,7 +227,6 @@ void roam_goal (edict_t *self)
|
|||
gi.linkentity (ent);
|
||||
|
||||
oldlen = 0;
|
||||
whichi = 0;
|
||||
for (i=0; i<12; i++)
|
||||
{
|
||||
|
||||
|
|
|
@ -160,7 +160,6 @@ void 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;
|
||||
|
@ -203,7 +202,6 @@ void 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);
|
||||
|
||||
|
@ -367,11 +365,9 @@ G_SetStats
|
|||
void G_SetStats (edict_t *ent)
|
||||
{
|
||||
gitem_t *item;
|
||||
int index, cells;
|
||||
int index, cells = 0;
|
||||
int power_armor_type;
|
||||
|
||||
cells = 0;
|
||||
|
||||
//
|
||||
// health
|
||||
//
|
||||
|
|
|
@ -1571,24 +1571,20 @@ void weapon_ionripper_fire (edict_t *ent)
|
|||
vec3_t offset;
|
||||
vec3_t tempang;
|
||||
int damage;
|
||||
int kick;
|
||||
|
||||
if (deathmatch->value)
|
||||
{
|
||||
// tone down for deathmatch
|
||||
damage = 30;
|
||||
kick = 40;
|
||||
}
|
||||
else
|
||||
{
|
||||
damage = 50;
|
||||
kick = 60;
|
||||
}
|
||||
|
||||
if (is_quad)
|
||||
{
|
||||
damage *= 4;
|
||||
kick *= 4;
|
||||
}
|
||||
|
||||
VectorCopy (ent->client->v_angle, tempang);
|
||||
|
|
Loading…
Reference in a new issue