Merge branch 'master' of https://github.com/rheit/zdoom

src/nodebuild.cpp

@@ -90,7 +90,7 @@ FNodeBuilder::~FNodeBuilder()
 	}
 	if (OldVertexTable != NULL)
 	{
-		delete OldVertexTable;
+		delete[] OldVertexTable;
 	}
 }
 

src/p_mobj.cpp

@@ -2936,7 +2936,7 @@ bool AActor::IsOkayToAttack (AActor *link)
 	if (P_CheckSight (this, link))
 	{
 		// AMageStaffFX2::IsOkayToAttack had an extra check here, generalized with a flag,
-		// to only allow the check to succeed if the enemy was in a ~84° FOV of the player
+		// to only allow the check to succeed if the enemy was in a ~84<EFBFBD> FOV of the player
 		if (flags3 & MF3_SCREENSEEKER)
 		{
 			angle_t angle = R_PointToAngle2(Friend->x, 
@@ -6167,25 +6167,25 @@ void PrintMiscActorInfo(AActor *query)
 		static const char * renderstyles[]= {"None", "Normal", "Fuzzy", "SoulTrans",
 			"OptFuzzy", "Stencil", "Translucent", "Add", "Shaded", "TranslucentStencil"};
 
-		Printf("%s @ %p has the following flags:\n\tflags: %x", query->GetTag(), query, query->flags);
+		Printf("%s @ %p has the following flags:\n   flags: %x", query->GetTag(), query, query->flags);
 		for (flagi = 0; flagi <= 31; flagi++)
 			if (query->flags & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags));
-		Printf("\n\tflags2: %x", query->flags2);
+		Printf("\n   flags2: %x", query->flags2);
 		for (flagi = 0; flagi <= 31; flagi++)
 			if (query->flags2 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags2));
-		Printf("\n\tflags3: %x", query->flags3);
+		Printf("\n   flags3: %x", query->flags3);
 		for (flagi = 0; flagi <= 31; flagi++)
 			if (query->flags3 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags3));
-		Printf("\n\tflags4: %x", query->flags4);
+		Printf("\n   flags4: %x", query->flags4);
 		for (flagi = 0; flagi <= 31; flagi++)
 			if (query->flags4 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags4));
-		Printf("\n\tflags5: %x", query->flags5);
+		Printf("\n   flags5: %x", query->flags5);
 		for (flagi = 0; flagi <= 31; flagi++)
 			if (query->flags5 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags5));
-		Printf("\n\tflags6: %x", query->flags6);
+		Printf("\n   flags6: %x", query->flags6);
 		for (flagi = 0; flagi <= 31; flagi++)
 			if (query->flags6 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags6));
-		Printf("\n\tflags7: %x", query->flags7);
+		Printf("\n   flags7: %x", query->flags7);
 		for (flagi = 0; flagi <= 31; flagi++)
 			if (query->flags7 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags7));
 		Printf("\nBounce flags: %x\nBounce factors: f:%f, w:%f", 

tools/updaterevision/updaterevision.c

@@ -34,7 +34,7 @@ void stripnl(char *str)
 
 int main(int argc, char **argv)
 {
-	char vertag[64], lastlog[64], lasthash[64], *hash = NULL;
+	char vertag[128], lastlog[128], lasthash[128], *hash = NULL;
 	FILE *stream = NULL;
 	int gotrev = 0, needupdate = 1;
 

wadsrc/static/actors/heretic/hereticimp.txt

@@ -82,6 +82,7 @@ ACTOR HereticImpLeader : HereticImp 5
 {
 	Game Heretic
 	SpawnID 7
+	Species "HereticImpLeader"
 	Health 80
 	-MISSILEMORE
 	AttackSound "himp/leaderattack"

wadsrc/static/actors/heretic/mummy.txt

@@ -55,6 +55,7 @@ ACTOR MummyLeader : Mummy 45
 {
 	Game Heretic
 	SpawnID 2
+	Species "MummyLeader"
 	Health 100
 	Painchance 64
 	Obituary "$OB_MUMMYLEADER"
@@ -89,6 +90,7 @@ ACTOR MummyLeaderGhost : MummyLeader 46
 {
 	Game Heretic
 	SpawnID 9
+	Species "MummyLeaderGhost"
 	+SHADOW
 	+GHOST
 	RenderStyle Translucent

wadsrc/static/actors/hexen/heresiarch.txt

@@ -18,6 +18,7 @@ ACTOR Heresiarch 10080 native
 	+NOTARGET
 	+NOICEDEATH
 	+DEFLECT
+	+NOBLOOD
 	SeeSound "SorcererSight"
 	PainSound "SorcererPain"
 	DeathSound "SorcererDeathScream"

wadsrc/static/sndinfo.txt

@@ -634,7 +634,7 @@ $limit misc/spawn		1
 //
 
 minotaur/sight			minsit
-minotaur/melee			stfhit
+minotaur/melee			stfpow
 minotaur/attack1		minat1
 minotaur/attack2		minat2
 minotaur/attack3		minat3