Cleaned up.

This commit is contained in:
MajorCooke 2016-05-30 15:29:23 -05:00 committed by Christoph Oelckers
parent 3c7e1e0528
commit 791852a6bd

View file

@ -1665,8 +1665,6 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CustomBulletAttack)
{ {
DAngle angle = bangle; DAngle angle = bangle;
DAngle slope = bslope; DAngle slope = bslope;
DAngle tempangle = (pr_cwbullet.Random2() / 255.);
DAngle tempslope = (pr_cwbullet.Random2() / 255.);
if (flags & CBAF_EXPLICITANGLE) if (flags & CBAF_EXPLICITANGLE)
{ {
@ -1675,8 +1673,8 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CustomBulletAttack)
} }
else else
{ {
angle += spread_xy * tempangle; angle += spread_xy * (pr_cwbullet.Random2() / 255.);
slope += spread_z * tempslope; slope += spread_z * (pr_cwbullet.Random2() / 255.);
} }
int damage = damageperbullet; int damage = damageperbullet;
@ -1838,7 +1836,6 @@ static void FireBulletMissile(AActor *self, PClassActor *missile, AActor *puff,
double y = Spawnofs_xy * angle.Sin(); double y = Spawnofs_xy * angle.Sin();
DAngle ang = self->Angles.Yaw - 90; DAngle ang = self->Angles.Yaw - 90;
DVector2 ofs = ang.ToVector(Spawnofs_xy); DVector2 ofs = ang.ToVector(Spawnofs_xy);
//AActor *proj = P_SpawnMissileXYZ(self->Vec3Offset(x, y, z + self->GetBobOffset()), self, puff, missile, false);
AActor *proj = P_SpawnPlayerMissile(self, ofs.X, ofs.Y, Spawnheight, missile, angle, nullptr, nullptr, false, true); AActor *proj = P_SpawnPlayerMissile(self, ofs.X, ofs.Y, Spawnheight, missile, angle, nullptr, nullptr, false, true);
if (proj) if (proj)