OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

SVN r179 (trunk)

Browse source
This commit is contained in:
Christoph Oelckers 2006-06-07 20:53:40 +00:00
commit 6b821afa64
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/thingdef_codeptr.cpp
View file

@ -868,7 +868,8 @@ void A_CustomPunch (AActor *self)
if (!norandom) Damage *= (pr_cwpunch()%8+1);
angle = self->angle + (pr_cwpunch.Random2() << 18);
pitch = P_AimLineAttack (self, angle, MELEERANGE);
if (Range == 0) Range = MELEERANGE;
pitch = P_AimLineAttack (self, angle, Range);
// only use ammo when actually hitting something!
if (UseAmmo && linetarget && weapon)
@ -879,7 +880,6 @@ void A_CustomPunch (AActor *self)
PuffType = PClass::FindClass(PuffTypeName);
if (!PuffType) PuffType=RUNTIME_CLASS(ABulletPuff);
if (Range == 0) Range = MELEERANGE;
P_LineAttack (self, angle, Range, pitch, Damage, GetDefaultByType(PuffType)->DamageType, PuffType);
// turn to face target