mirror of
https://github.com/yquake2/rogue.git
synced 2024-11-25 21:51:22 +00:00
Merge pull request #67 from NeonKnightOA/turretfix
Fix: Turrets shooting faster while in melee range, which wasn't intended.
This commit is contained in:
commit
03a7d77127
1 changed files with 0 additions and 15 deletions
|
@ -980,7 +980,6 @@ turret_checkattack(edict_t *self)
|
||||||
vec3_t spot1, spot2;
|
vec3_t spot1, spot2;
|
||||||
float chance, nexttime;
|
float chance, nexttime;
|
||||||
trace_t tr;
|
trace_t tr;
|
||||||
int enemy_range;
|
|
||||||
|
|
||||||
if (!self)
|
if (!self)
|
||||||
{
|
{
|
||||||
|
@ -1048,20 +1047,6 @@ turret_checkattack(edict_t *self)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
enemy_range = range(self, self->enemy);
|
|
||||||
|
|
||||||
if (enemy_range == RANGE_MELEE)
|
|
||||||
{
|
|
||||||
/* don't always melee in easy mode */
|
|
||||||
if ((skill->value == SKILL_EASY) && (rand() & 3))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
self->monsterinfo.attack_state = AS_MISSILE;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (self->spawnflags & SPAWN_ROCKET)
|
if (self->spawnflags & SPAWN_ROCKET)
|
||||||
{
|
{
|
||||||
chance = 0.10;
|
chance = 0.10;
|
||||||
|
|
Loading…
Reference in a new issue