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

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);
 		}

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;