Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Allanis 2014-03-12 19:59:29 +00:00
commit a5dbf23a6c
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/weapon.c
View File

@ -723,15 +723,27 @@ static Weapon* weapon_create(const Outfit* outfit, const double dir, const Vec2*
/* Get the distance. */
dist = vect_dist(pos, &pilot_target->solid->pos);
/* Time for shots to reach that distance. */
t = dist / w->outfit->u.blt.speed;
/* Aim. */
if(dist > outfit->u.blt.range*1.2) {
x = pilot_target->solid->pos.x - pos->x;
y = pilot_target->solid->pos.y - pos->y;
} else {
/*
* Try to predict where the enemy will be.
* Time for shots to reach that distance.
*/
t = dist / w->outfit->u.blt.speed;
/* Position is calculated on where it should be. */
x = (pilot_target->solid->pos.x + pilot_target->solid->vel.x*t)
- (pos->x + vel->x*t);
y = (pilot_target->solid->pos.y + pilot_target->solid->vel.y*t)
- (pos->y + vel->y*t);
/* Position is calculated on where it should be. */
x = (pilot_target->solid->pos.x + pilot_target->solid->vel.x*t)
- (pos->x + vel->x * t);
y = (pilot_target->solid->pos.y + pilot_target->solid->vel.y * t)
- (pos->y + vel->y * t);
}
/* Set angle to face. */
vect_cset(&v, x, y);
rdir = VANGLE(v);
}
} else /* Fire straight. */