Fix the player melee fix

MrAlaux · MrAlaux · commit eac4d2ff3f45 · 2023-12-15T05:26:08.000-03:00
Additionally, some reformatting.
diff --git a/src/p_pspr.c b/src/p_pspr.c
@@ -759,8 +759,8 @@ void A_Punch(player_t *player, pspdef_t *psp)
 
     do {
       // killough 8/2/98: make autoaiming prefer enemies
-      const int mask = demo_version < 203 ? 0 : MF_FRIEND;
-      angle = player->mo->angle + ANG20 - (ANG2*i);
+      const int mask = (demo_version < 203) ? 0 : MF_FRIEND;
+      angle = player->mo->angle + ANG20 - (ANG2 * i);
 
       if (vertical_aiming == VERTAIM_DIRECT)
       { slope = player->slope; }
@@ -794,7 +794,7 @@ void A_Punch(player_t *player, pspdef_t *psp)
   if (vertical_aiming == VERTAIM_DIRECT)
   {
     slope = player->slope;
-    linetarget = NULL;
+    P_AimLineAttack(player->mo, player->mo->angle, range, 0);
   }
   else {
     // killough 8/2/98: make autoaiming prefer enemies
@@ -847,7 +847,7 @@ void A_Saw(player_t *player, pspdef_t *psp)
   if (vertical_aiming == VERTAIM_DIRECT)
   {
     slope = player->slope;
-    linetarget = NULL;
+    P_AimLineAttack(player->mo, player->mo->angle, range, 0);
   }
   else {
     // killough 8/2/98: make autoaiming prefer enemies
@@ -1590,7 +1590,7 @@ void A_WeaponMeleeAttack(player_t *player, pspdef_t *psp)
   if (vertical_aiming == VERTAIM_DIRECT)
   {
     slope = player->slope;
-    linetarget = NULL;
+    P_AimLineAttack(player->mo, player->mo->angle, range, 0);
   }
   else {
     // make autoaim prefer enemies

Original file line number	Diff line number	Diff line change
`@@ -759,8 +759,8 @@ void A_Punch(player_t player, pspdef_t psp)`
`759`	`759`
`760`	`760`	`do {`
`761`	`761`	`// killough 8/2/98: make autoaiming prefer enemies`
`762`		`- const int mask = demo_version < 203 ? 0 : MF_FRIEND;`
`763`		`- angle = player->mo->angle + ANG20 - (ANG2*i);`
	`762`	`+ const int mask = (demo_version < 203) ? 0 : MF_FRIEND;`
	`763`	`+ angle = player->mo->angle + ANG20 - (ANG2 * i);`
`764`	`764`
`765`	`765`	`if (vertical_aiming == VERTAIM_DIRECT)`
`766`	`766`	`{ slope = player->slope; }`
`@@ -794,7 +794,7 @@ void A_Punch(player_t player, pspdef_t psp)`
`794`	`794`	`if (vertical_aiming == VERTAIM_DIRECT)`
`795`	`795`	`{`
`796`	`796`	`slope = player->slope;`
`797`		`- linetarget = NULL;`
	`797`	`+ P_AimLineAttack(player->mo, player->mo->angle, range, 0);`
`798`	`798`	`}`
`799`	`799`	`else {`
`800`	`800`	`// killough 8/2/98: make autoaiming prefer enemies`
`@@ -847,7 +847,7 @@ void A_Saw(player_t player, pspdef_t psp)`
`847`	`847`	`if (vertical_aiming == VERTAIM_DIRECT)`
`848`	`848`	`{`
`849`	`849`	`slope = player->slope;`
`850`		`- linetarget = NULL;`
	`850`	`+ P_AimLineAttack(player->mo, player->mo->angle, range, 0);`
`851`	`851`	`}`
`852`	`852`	`else {`
`853`	`853`	`// killough 8/2/98: make autoaiming prefer enemies`
`@@ -1590,7 +1590,7 @@ void A_WeaponMeleeAttack(player_t player, pspdef_t psp)`
`1590`	`1590`	`if (vertical_aiming == VERTAIM_DIRECT)`
`1591`	`1591`	`{`
`1592`	`1592`	`slope = player->slope;`
`1593`		`- linetarget = NULL;`
	`1593`	`+ P_AimLineAttack(player->mo, player->mo->angle, range, 0);`
`1594`	`1594`	`}`
`1595`	`1595`	`else {`
`1596`	`1596`	`// make autoaim prefer enemies`