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

[Add] Take into account outfit sprite size when creating outfit.

Browse Source
This commit is contained in:
Allanis 2014-05-20 15:39:00 +01:00
parent 5e34b27baa
commit d06e4a6383
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/weapon.c
View File

@ -722,7 +722,7 @@ static void weapon_hitBeam(Weapon* w, Pilot* p, WeaponLayer layer,
*/ */
static Weapon* weapon_create(const Outfit* outfit, const double dir, const Vec2* pos, static Weapon* weapon_create(const Outfit* outfit, const double dir, const Vec2* pos,
const Vec2* vel, unsigned int parent, const unsigned int target) { const Vec2* vel, unsigned int parent, const unsigned int target) {
Vec2 v; Vec2 v, vp;
double mass, rdir; double mass, rdir;
Pilot* pilot_target; Pilot* pilot_target;
double x, y, t, dist; double x, y, t, dist;
@ -780,11 +780,15 @@ 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);
/* Set the position to include sprite size. */
vect_cset(&vp, pos->x + cos(rdir)*w->outfit->u.blt.gfx_space->sx/2.,
pos->y + sin(rdir)*w->outfit->u.blt.gfx_space->sy/2.);
mass = 1; /* Lasers are presumed to have unitory mass. */ mass = 1; /* Lasers are presumed to have unitory mass. */
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, &vp, &v);
w->voice = sound_playPos(w->outfit->u.blt.sound, w->voice = sound_playPos(w->outfit->u.blt.sound,
w->solid->pos.x + w->solid->vel.x, w->solid->pos.x + w->solid->vel.x,
w->solid->pos.y + w->solid->vel.y); w->solid->pos.y + w->solid->vel.y);