- fixed: Hexen's melee weapons were missing some NULL pointer checks in the code that determines whether they hit something or not.

SVN r2415 (trunk)

src/g_hexen/a_clericmace.cpp

@@ -37,22 +37,24 @@ DEFINE_ACTION_FUNCTION(AActor, A_CMaceAttack)
 		if (linetarget)
 		{
 			P_LineAttack (player->mo, angle, 2*MELEERANGE, slope, damage, NAME_Melee, PClass::FindClass ("HammerPuff"), true, &linetarget);
+			if (linetarget != NULL)
+			{
 				AdjustPlayerAngle (player->mo, linetarget);
-//			player->mo->angle = R_PointToAngle2(player->mo->x,
-//				player->mo->y, linetarget->x, linetarget->y);
 				goto macedone;
 			}
+		}
 		angle = player->mo->angle-i*(ANG45/16);
 		slope = P_AimLineAttack (player->mo, angle, 2*MELEERANGE, &linetarget);
 		if (linetarget)
 		{
 			P_LineAttack (player->mo, angle, 2*MELEERANGE, slope, damage, NAME_Melee, PClass::FindClass ("HammerPuff"), true, &linetarget);
+			if (linetarget != NULL)
+			{
 				AdjustPlayerAngle (player->mo, linetarget);
-//			player->mo->angle = R_PointToAngle2(player->mo->x,
-//				player->mo->y, linetarget->x, linetarget->y);
 				goto macedone;
 			}
 		}
+	}
 	// didn't find any creatures, so try to strike any walls
 	player->mo->special1 = 0;
 

src/g_hexen/a_fighteraxe.cpp

@@ -226,6 +226,8 @@ DEFINE_ACTION_FUNCTION(AActor, A_FAxeAttack)
 		if (linetarget)
 		{
 			P_LineAttack (pmo, angle, AXERANGE, slope, damage, NAME_Melee, pufftype, true, &linetarget);
+			if (linetarget != NULL)
+			{
 				if (linetarget->flags3&MF3_ISMONSTER || linetarget->player)
 				{
 					P_ThrustMobj (linetarget, angle, power);
@@ -234,11 +236,14 @@ DEFINE_ACTION_FUNCTION(AActor, A_FAxeAttack)
 				useMana++; 
 				goto axedone;
 			}
+		}
 		angle = pmo->angle-i*(ANG45/16);
 		slope = P_AimLineAttack (pmo, angle, AXERANGE, &linetarget);
 		if (linetarget)
 		{
 			P_LineAttack (pmo, angle, AXERANGE, slope, damage, NAME_Melee, pufftype, true, &linetarget);
+			if (linetarget != NULL)
+			{
 				if (linetarget->flags3&MF3_ISMONSTER)
 				{
 					P_ThrustMobj (linetarget, angle, power);
@@ -248,6 +253,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_FAxeAttack)
 				goto axedone;
 			}
 		}
+	}
 	// didn't find any creatures, so try to strike any walls
 	pmo->special1 = 0;
 

src/g_hexen/a_fighterhammer.cpp

@@ -50,6 +50,8 @@ DEFINE_ACTION_FUNCTION(AActor, A_FHammerAttack)
 		if (linetarget)
 		{
 			P_LineAttack (pmo, angle, HAMMER_RANGE, slope, damage, NAME_Melee, PClass::FindClass ("HammerPuff"), true, &linetarget);
+			if (linetarget != NULL)
+			{
 				AdjustPlayerAngle(pmo, linetarget);
 				if (linetarget->flags3&MF3_ISMONSTER || linetarget->player)
 				{
@@ -58,11 +60,14 @@ DEFINE_ACTION_FUNCTION(AActor, A_FHammerAttack)
 				pmo->special1 = false; // Don't throw a hammer
 				goto hammerdone;
 			}
+		}
 		angle = pmo->angle-i*(ANG45/32);
 		slope = P_AimLineAttack(pmo, angle, HAMMER_RANGE, &linetarget, 0, ALF_CHECK3D);
 		if(linetarget)
 		{
 			P_LineAttack(pmo, angle, HAMMER_RANGE, slope, damage, NAME_Melee, PClass::FindClass ("HammerPuff"), true, &linetarget);
+			if (linetarget != NULL)
+			{
 				AdjustPlayerAngle(pmo, linetarget);
 				if (linetarget->flags3&MF3_ISMONSTER || linetarget->player)
 				{
@@ -72,6 +77,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_FHammerAttack)
 				goto hammerdone;
 			}
 		}
+	}
 	// didn't find any targets in meleerange, so set to throw out a hammer
 	angle = pmo->angle;
 	slope = P_AimLineAttack (pmo, angle, HAMMER_RANGE, &linetarget, 0, ALF_CHECK3D);

src/g_hexen/a_fighterplayer.cpp

@@ -166,6 +166,8 @@ DEFINE_ACTION_FUNCTION(AActor, A_FPunchAttack)
 				pufftype = PClass::FindClass ("HammerPuff");
 			}
 			P_LineAttack (pmo, angle, 2*MELEERANGE, slope, damage, NAME_Melee, pufftype, true, &linetarget);
+			if (linetarget != NULL)
+			{
 				if (linetarget->flags3&MF3_ISMONSTER || linetarget->player)
 				{
 					P_ThrustMobj (linetarget, angle, power);
@@ -173,6 +175,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_FPunchAttack)
 				AdjustPlayerAngle (pmo, linetarget);
 				goto punchdone;
 			}
+		}
 		angle = pmo->angle-i * (ANG45/16);
 		slope = P_AimLineAttack (pmo, angle, 2*MELEERANGE, &linetarget);
 		if (linetarget)
@@ -185,6 +188,8 @@ DEFINE_ACTION_FUNCTION(AActor, A_FPunchAttack)
 				pufftype = PClass::FindClass ("HammerPuff");
 			}
 			P_LineAttack (pmo, angle, 2*MELEERANGE, slope, damage, NAME_Melee, pufftype, true, &linetarget);
+			if (linetarget != NULL)
+			{
 				if (linetarget->flags3&MF3_ISMONSTER || linetarget->player)
 				{
 					P_ThrustMobj (linetarget, angle, power);
@@ -193,6 +198,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_FPunchAttack)
 				goto punchdone;
 			}
 		}
+	}
 	// didn't find any creatures, so try to strike any walls
 	pmo->special1 = 0;