From 9dbfa6d04ed14044f134634fc63a7261dfe906f6 Mon Sep 17 00:00:00 2001 From: Edoardo Prezioso Date: Fri, 2 Dec 2016 13:22:42 +0100 Subject: [PATCH 1/3] - Fixed uninitialized line number info in thing map parsing. --- src/p_things.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/p_things.cpp b/src/p_things.cpp index d94ba6a019..ba377abebb 100644 --- a/src/p_things.cpp +++ b/src/p_things.cpp @@ -601,6 +601,7 @@ static void ParseSpawnMap(FScanner &sc, SpawnMap & themap, const char *descript) } defined[ednum] = true; editem.classname = sc.String; + editem.linenum = sc.Line; themap.Insert(ednum, editem); } From 60b1f5c25ab1ef89b1cc17075c5684fae35855e4 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 2 Dec 2016 19:37:54 +0100 Subject: [PATCH 2/3] - fixed: FPNGTexture::fr could be left uninitialized. --- src/textures/pngtexture.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/textures/pngtexture.cpp b/src/textures/pngtexture.cpp index d34b006079..d24cd92d11 100644 --- a/src/textures/pngtexture.cpp +++ b/src/textures/pngtexture.cpp @@ -211,6 +211,7 @@ FPNGTexture::FPNGTexture (FileReader &lump, int lumpnum, const FString &filename int i; if (lumpnum == -1) fr = &lump; + else fr = nullptr; UseType = TEX_MiscPatch; LeftOffset = 0; From 87d2991256ffa089159783b31a9c7ab78c229c94 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 2 Dec 2016 20:13:30 +0100 Subject: [PATCH 3/3] - removed all cluster music definitions so that the default from the gameinfo section can be used to change it. --- wadsrc/static/mapinfo/chex.txt | 4 ---- wadsrc/static/mapinfo/doom1.txt | 4 ---- wadsrc/static/mapinfo/doom2.txt | 7 ------- wadsrc/static/mapinfo/heretic.txt | 5 ----- wadsrc/static/mapinfo/hexen.txt | 4 ---- wadsrc/static/mapinfo/plutonia.txt | 6 ------ wadsrc/static/mapinfo/tnt.txt | 6 ------ 7 files changed, 36 deletions(-) diff --git a/wadsrc/static/mapinfo/chex.txt b/wadsrc/static/mapinfo/chex.txt index 00904b1341..bf42fcbcd7 100644 --- a/wadsrc/static/mapinfo/chex.txt +++ b/wadsrc/static/mapinfo/chex.txt @@ -255,28 +255,24 @@ map E1M5 lookup "CHUSTR_E1M5" cluster 1 { flat = "FLOOR4_8" - music = "$MUSIC_VICTOR" exittext = lookup, "CE1TEXT" } cluster 2 { flat = "SFLR6_1" - music = "$MUSIC_VICTOR" exittext = lookup, "CE2TEXT" } cluster 3 { flat = "MFLR8_4" - music = "$MUSIC_VICTOR" exittext = lookup, "CE3TEXT" } cluster 4 { flat = "MFLR8_3" - music = "$MUSIC_VICTOR" exittext = lookup, "CE4TEXT" } diff --git a/wadsrc/static/mapinfo/doom1.txt b/wadsrc/static/mapinfo/doom1.txt index 62040ca15f..2baba9a5d9 100644 --- a/wadsrc/static/mapinfo/doom1.txt +++ b/wadsrc/static/mapinfo/doom1.txt @@ -506,28 +506,24 @@ map E4M9 lookup "HUSTR_E4M9" cluster 1 { flat = "$bgflatE1" - music = "$MUSIC_VICTOR" exittext = lookup, "E1TEXT" } cluster 2 { flat = "$bgflatE2" - music = "$MUSIC_VICTOR" exittext = lookup, "E2TEXT" } cluster 3 { flat = "$bgflatE3" - music = "$MUSIC_VICTOR" exittext = lookup, "E3TEXT" } cluster 4 { flat = "$bgflatE4" - music = "$MUSIC_VICTOR" exittext = lookup, "E4TEXT" } diff --git a/wadsrc/static/mapinfo/doom2.txt b/wadsrc/static/mapinfo/doom2.txt index 166d2d202d..6268f52c93 100644 --- a/wadsrc/static/mapinfo/doom2.txt +++ b/wadsrc/static/mapinfo/doom2.txt @@ -380,7 +380,6 @@ map MAP32 lookup "HUSTR_32" cluster 5 { flat = "$BGFLAT06" - music = "$MUSIC_READ_M" exittext = lookup, "C1TEXT" } @@ -390,7 +389,6 @@ cluster 5 cluster 6 { flat = "$BGFLAT11" - music = "$MUSIC_READ_M" exittext = lookup, "C2TEXT" } @@ -400,7 +398,6 @@ cluster 6 cluster 7 { flat = "$BGFLAT20" - music = "$MUSIC_READ_M" exittext = lookup, "C3TEXT" } @@ -409,7 +406,6 @@ cluster 7 cluster 8 { flat = "$BGFLAT30" - music = "$MUSIC_READ_M" exittext = lookup, "C4TEXT" } @@ -418,7 +414,6 @@ cluster 8 cluster 9 { flat = "$BGFLAT15" - music = "$MUSIC_READ_M" entertext = lookup, "C5TEXT" } @@ -427,7 +422,6 @@ cluster 9 cluster 10 { flat = "$BGFLAT31" - music = "$MUSIC_READ_M" entertext = lookup, "C6TEXT" } @@ -537,7 +531,6 @@ map LEVEL09 lookup "NHUSTR_9" cluster 11 { flat = "SLIME16" - music = "$MUSIC_READ_M" exittext = lookup, "NERVETEXT" } diff --git a/wadsrc/static/mapinfo/heretic.txt b/wadsrc/static/mapinfo/heretic.txt index a1e2efb0cd..5f822d870e 100644 --- a/wadsrc/static/mapinfo/heretic.txt +++ b/wadsrc/static/mapinfo/heretic.txt @@ -805,35 +805,30 @@ map E6M3 "Untitled" cluster 1 { flat = "FLOOR25" - music = "MUS_CPTD" exittext = lookup, "HE1TEXT" } cluster 2 { flat = "FLATHUH1" - music = "MUS_CPTD" exittext = lookup, "HE2TEXT" } cluster 3 { flat = "FLTWAWA2" - music = "MUS_CPTD" exittext = lookup, "HE3TEXT" } cluster 4 { flat = "FLOOR28" - music = "MUS_CPTD" exittext = lookup, "HE4TEXT" } cluster 5 { flat = "FLOOR08" - music = "MUS_CPTD" exittext = lookup, "HE5TEXT" } diff --git a/wadsrc/static/mapinfo/hexen.txt b/wadsrc/static/mapinfo/hexen.txt index c2dbf959a6..be9a6ef652 100644 --- a/wadsrc/static/mapinfo/hexen.txt +++ b/wadsrc/static/mapinfo/hexen.txt @@ -464,7 +464,6 @@ cluster 1 hub exittext = "clus1msg" exittextislump - music = "hub" pic = "interpic" } @@ -473,7 +472,6 @@ cluster 2 hub exittext = "clus2msg" exittextislump - music = "hub" pic = "interpic" } @@ -482,7 +480,6 @@ cluster 3 hub exittext = "clus3msg" exittextislump - music = "hub" pic = "interpic" } @@ -491,7 +488,6 @@ cluster 4 hub exittext = "clus4msg" exittextislump - music = "hub" pic = "interpic" } diff --git a/wadsrc/static/mapinfo/plutonia.txt b/wadsrc/static/mapinfo/plutonia.txt index 7126c56059..d4fefba860 100644 --- a/wadsrc/static/mapinfo/plutonia.txt +++ b/wadsrc/static/mapinfo/plutonia.txt @@ -374,7 +374,6 @@ map MAP32 lookup "PHUSTR_32" cluster 5 { flat = "$BGFLAT06" - music = "$MUSIC_READ_M" exittext = lookup, "P1TEXT" } @@ -383,7 +382,6 @@ cluster 5 cluster 6 { flat = "$BGFLAT11" - music = "$MUSIC_READ_M" exittext = lookup, "P2TEXT" } @@ -392,7 +390,6 @@ cluster 6 cluster 7 { flat = "$BGFLAT20" - music = "$MUSIC_READ_M" exittext = lookup, "P3TEXT" } @@ -401,7 +398,6 @@ cluster 7 cluster 8 { flat = "$BGFLAT30" - music = "$MUSIC_READ_M" exittext = lookup, "P4TEXT" } @@ -410,7 +406,6 @@ cluster 8 cluster 9 { flat = "$BGFLAT15" - music = "$MUSIC_READ_M" entertext = lookup, "P5TEXT" } @@ -419,7 +414,6 @@ cluster 9 cluster 10 { flat = "$BGFLAT31" - music = "$MUSIC_READ_M" entertext = lookup, "P6TEXT" } diff --git a/wadsrc/static/mapinfo/tnt.txt b/wadsrc/static/mapinfo/tnt.txt index 15f71389d1..12768a5c36 100644 --- a/wadsrc/static/mapinfo/tnt.txt +++ b/wadsrc/static/mapinfo/tnt.txt @@ -374,7 +374,6 @@ map MAP32 lookup "THUSTR_32" cluster 5 { flat = "$BGFLAT06" - music = "$MUSIC_READ_M" exittext = lookup, "T1TEXT" } @@ -383,7 +382,6 @@ cluster 5 cluster 6 { flat = "$BGFLAT11" - music = "$MUSIC_READ_M" exittext = lookup, "T2TEXT" } @@ -392,7 +390,6 @@ cluster 6 cluster 7 { flat = "$BGFLAT20" - music = "$MUSIC_READ_M" exittext = lookup, "T3TEXT" } @@ -401,7 +398,6 @@ cluster 7 cluster 8 { flat = "$BGFLAT30" - music = "$MUSIC_READ_M" exittext = lookup, "T4TEXT" } @@ -410,7 +406,6 @@ cluster 8 cluster 9 { flat = "$BGFLAT15" - music = "$MUSIC_READ_M" entertext = lookup, "T5TEXT" } @@ -419,6 +414,5 @@ cluster 9 cluster 10 { flat = "$BGFLAT31" - music = "$MUSIC_READ_M" entertext = lookup, "T6TEXT" }