From 3c8e9b6dc06cc0fbd2cfeed77e48f58c5438d327 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 16 Mar 2014 12:29:04 +0200 Subject: [PATCH 1/7] Fix incorrect Maulotaur melee attack sound It was STFHIT instead of STFPOW --- wadsrc/static/sndinfo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wadsrc/static/sndinfo.txt b/wadsrc/static/sndinfo.txt index 49c6279b0..5508cd89b 100644 --- a/wadsrc/static/sndinfo.txt +++ b/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 From 5789ac624549907a7ff4c86edce5142083290876 Mon Sep 17 00:00:00 2001 From: Edoardo Prezioso Date: Sun, 16 Mar 2014 13:21:08 +0100 Subject: [PATCH 2/7] - Fixed new[]/delete mismatch in FNodeBuilder Found with address sanitizer. --- src/nodebuild.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nodebuild.cpp b/src/nodebuild.cpp index be5d0591d..f3ceec17d 100644 --- a/src/nodebuild.cpp +++ b/src/nodebuild.cpp @@ -90,7 +90,7 @@ FNodeBuilder::~FNodeBuilder() } if (OldVertexTable != NULL) { - delete OldVertexTable; + delete[] OldVertexTable; } } From 6a958b032c2d060bf07530aa314c1173a457c9f6 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 18 Mar 2014 12:29:14 +0200 Subject: [PATCH 3/7] Add NOBLOOD flag to Heresiarch actor Heresiarch entity in vanilla Hexen doesn't spawn blood when hit --- wadsrc/static/actors/hexen/heresiarch.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/wadsrc/static/actors/hexen/heresiarch.txt b/wadsrc/static/actors/hexen/heresiarch.txt index 999f50540..5a77240fc 100644 --- a/wadsrc/static/actors/hexen/heresiarch.txt +++ b/wadsrc/static/actors/hexen/heresiarch.txt @@ -18,6 +18,7 @@ ACTOR Heresiarch 10080 native +NOTARGET +NOICEDEATH +DEFLECT + +NOBLOOD SeeSound "SorcererSight" PainSound "SorcererPain" DeathSound "SorcererDeathScream" From a97b068ed7df7ff0f04d521b69f5d81392a3e8ee Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 30 Mar 2014 13:27:27 +0300 Subject: [PATCH 4/7] Enable fighting between different types of gargoyles and golems In vanilla Heretic: - Gargoyles are able to fight with Fire Gargoyles - Golems are able to fight with Nitro Golems, both regular and ghosted versions --- wadsrc/static/actors/heretic/hereticimp.txt | 1 + wadsrc/static/actors/heretic/mummy.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/wadsrc/static/actors/heretic/hereticimp.txt b/wadsrc/static/actors/heretic/hereticimp.txt index 25f64a2ea..2659d248a 100644 --- a/wadsrc/static/actors/heretic/hereticimp.txt +++ b/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" diff --git a/wadsrc/static/actors/heretic/mummy.txt b/wadsrc/static/actors/heretic/mummy.txt index c6cc2389b..af4ff0c23 100644 --- a/wadsrc/static/actors/heretic/mummy.txt +++ b/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 From c47d77228d08840503aeeb7c4acd9e431193b9e1 Mon Sep 17 00:00:00 2001 From: crimsondusk Date: Sun, 30 Mar 2014 21:27:05 +0300 Subject: [PATCH 5/7] - increased updaterevision's buffer sizes to prevent GIT_BRANCH from cut short --- tools/updaterevision/updaterevision.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/updaterevision/updaterevision.c b/tools/updaterevision/updaterevision.c index 90127130a..6ccf174d0 100644 --- a/tools/updaterevision/updaterevision.c +++ b/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; From 79f6e77e2ba617e3496f7178a94811dbabad3092 Mon Sep 17 00:00:00 2001 From: Edward Richardson Date: Mon, 31 Mar 2014 23:49:21 +1300 Subject: [PATCH 6/7] Remove garbage characters from info CCMD --- src/p_mobj.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index 168d686fe..545052af8 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -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<flags2); + Printf("\n flags2: %x", query->flags2); for (flagi = 0; flagi <= 31; flagi++) if (query->flags2 & 1<flags3); + Printf("\n flags3: %x", query->flags3); for (flagi = 0; flagi <= 31; flagi++) if (query->flags3 & 1<flags4); + Printf("\n flags4: %x", query->flags4); for (flagi = 0; flagi <= 31; flagi++) if (query->flags4 & 1<flags5); + Printf("\n flags5: %x", query->flags5); for (flagi = 0; flagi <= 31; flagi++) if (query->flags5 & 1<flags6); + Printf("\n flags6: %x", query->flags6); for (flagi = 0; flagi <= 31; flagi++) if (query->flags6 & 1<flags7); + Printf("\nflags7: %x", query->flags7); for (flagi = 0; flagi <= 31; flagi++) if (query->flags7 & 1< Date: Mon, 31 Mar 2014 23:57:43 +1300 Subject: [PATCH 7/7] Missed space in flags7 line. --- src/p_mobj.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index 545052af8..75df3bb3e 100644 --- a/src/p_mobj.cpp +++ b/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� FOV of the player if (flags3 & MF3_SCREENSEEKER) { angle_t angle = R_PointToAngle2(Friend->x, @@ -6185,7 +6185,7 @@ void PrintMiscActorInfo(AActor *query) Printf("\n flags6: %x", query->flags6); for (flagi = 0; flagi <= 31; flagi++) if (query->flags6 & 1<flags7); + Printf("\n flags7: %x", query->flags7); for (flagi = 0; flagi <= 31; flagi++) if (query->flags7 & 1<