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

[Fix] Bug with unlimited range turret bolts.

Browse Source
This commit is contained in:
Allanis 2013-07-06 15:34:33 +01:00
parent bbc46d0eef
commit 00fbe34b62
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pilot.c
View File

@ -1098,7 +1098,7 @@ void pilots_render(void) {
int i; int i;
for(i = 1; i < pilot_nstack; i++) for(i = 1; i < pilot_nstack; i++)
/* Skip the player. */ /* Skip the player. */
if(pilot_stack[i]->render) if(pilot_stack[i]->render != NULL)
pilot_stack[i]->render(pilot_stack[i]); pilot_stack[i]->render(pilot_stack[i]);
} }

9
src/weapon.c
View File

@ -127,9 +127,10 @@ static void think_seeker(Weapon* w, const double dt) {
limit_speed(&w->solid->vel, w->outfit->u.amm.speed, dt); limit_speed(&w->solid->vel, w->outfit->u.amm.speed, dt);
} }
/* ======================================================== */ /* ========================================================
/* Smart seeker brain. Much better at homing. */ * Smart seeker brain. Much better at homing.
/* ======================================================== */ * ========================================================
*/
static void think_smart(Weapon* w, const double dt) { static void think_smart(Weapon* w, const double dt) {
Vec2 sv, tv; Vec2 sv, tv;
double t; double t;
@ -378,7 +379,7 @@ static Weapon* weapon_create(const Outfit* outfit, const double dir, const Vec2*
if((rdir > 2.*M_PI) || (rdir < 0.)) rdir = fmod(rdir, 2.*M_PI); if((rdir > 2.*M_PI) || (rdir < 0.)) rdir = fmod(rdir, 2.*M_PI);
vectcpy(&v, vel); vectcpy(&v, vel);
vect_cadd(&v, outfit->u.blt.speed*cos(rdir), outfit->u.blt.speed*sin(rdir)); vect_cadd(&v, outfit->u.blt.speed*cos(rdir), outfit->u.blt.speed*sin(rdir));
w->timer += outfit->u.blt.range / outfit->u.blt.speed; w->timer = outfit->u.blt.range / outfit->u.blt.speed;
w->solid = solid_create(mass, rdir, pos, &v); w->solid = solid_create(mass, rdir, pos, &v);
w->voice = sound_addVoice(VOICE_PRIORITY_BOLT, w->voice = sound_addVoice(VOICE_PRIORITY_BOLT,
w->solid->pos.x, w->solid->pos.y, w->solid->pos.x, w->solid->pos.y,