zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 07:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Rachael Alexanderson 2016-12-02 16:39:50 -05:00
commit c95372052c
9 changed files with 2 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/p_things.cpp
View file

@ -601,6 +601,7 @@ static void ParseSpawnMap(FScanner &sc, SpawnMap & themap, const char *descript)
} }
defined[ednum] = true; defined[ednum] = true;
editem.classname = sc.String; editem.classname = sc.String;
editem.linenum = sc.Line;
themap.Insert(ednum, editem); themap.Insert(ednum, editem);
} }

1
src/textures/pngtexture.cpp
View file

@ -211,6 +211,7 @@ FPNGTexture::FPNGTexture (FileReader &lump, int lumpnum, const FString &filename
int i; int i;
if (lumpnum == -1) fr = &lump; if (lumpnum == -1) fr = &lump;
else fr = nullptr;
UseType = TEX_MiscPatch; UseType = TEX_MiscPatch;
LeftOffset = 0; LeftOffset = 0;

4
wadsrc/static/mapinfo/chex.txt
View file

@ -255,28 +255,24 @@ map E1M5 lookup "CHUSTR_E1M5"
cluster 1 cluster 1
{ {
flat = "FLOOR4_8" flat = "FLOOR4_8"
music = "$MUSIC_VICTOR"
exittext = lookup, "CE1TEXT" exittext = lookup, "CE1TEXT"
} }
cluster 2 cluster 2
{ {
flat = "SFLR6_1" flat = "SFLR6_1"
music = "$MUSIC_VICTOR"
exittext = lookup, "CE2TEXT" exittext = lookup, "CE2TEXT"
} }
cluster 3 cluster 3
{ {
flat = "MFLR8_4" flat = "MFLR8_4"
music = "$MUSIC_VICTOR"
exittext = lookup, "CE3TEXT" exittext = lookup, "CE3TEXT"
} }
cluster 4 cluster 4
{ {
flat = "MFLR8_3" flat = "MFLR8_3"
music = "$MUSIC_VICTOR"
exittext = lookup, "CE4TEXT" exittext = lookup, "CE4TEXT"
} }

4
wadsrc/static/mapinfo/doom1.txt
View file

@ -506,28 +506,24 @@ map E4M9 lookup "HUSTR_E4M9"
cluster 1 cluster 1
{ {
flat = "$bgflatE1" flat = "$bgflatE1"
music = "$MUSIC_VICTOR"
exittext = lookup, "E1TEXT" exittext = lookup, "E1TEXT"
} }
cluster 2 cluster 2
{ {
flat = "$bgflatE2" flat = "$bgflatE2"
music = "$MUSIC_VICTOR"
exittext = lookup, "E2TEXT" exittext = lookup, "E2TEXT"
} }
cluster 3 cluster 3
{ {
flat = "$bgflatE3" flat = "$bgflatE3"
music = "$MUSIC_VICTOR"
exittext = lookup, "E3TEXT" exittext = lookup, "E3TEXT"
} }
cluster 4 cluster 4
{ {
flat = "$bgflatE4" flat = "$bgflatE4"
music = "$MUSIC_VICTOR"
exittext = lookup, "E4TEXT" exittext = lookup, "E4TEXT"
} }

7
wadsrc/static/mapinfo/doom2.txt
View file

@ -380,7 +380,6 @@ map MAP32 lookup "HUSTR_32"
cluster 5 cluster 5
{ {
flat = "$BGFLAT06" flat = "$BGFLAT06"
music = "$MUSIC_READ_M"
exittext = lookup, "C1TEXT" exittext = lookup, "C1TEXT"
} }
@ -390,7 +389,6 @@ cluster 5
cluster 6 cluster 6
{ {
flat = "$BGFLAT11" flat = "$BGFLAT11"
music = "$MUSIC_READ_M"
exittext = lookup, "C2TEXT" exittext = lookup, "C2TEXT"
} }
@ -400,7 +398,6 @@ cluster 6
cluster 7 cluster 7
{ {
flat = "$BGFLAT20" flat = "$BGFLAT20"
music = "$MUSIC_READ_M"
exittext = lookup, "C3TEXT" exittext = lookup, "C3TEXT"
} }
@ -409,7 +406,6 @@ cluster 7
cluster 8 cluster 8
{ {
flat = "$BGFLAT30" flat = "$BGFLAT30"
music = "$MUSIC_READ_M"
exittext = lookup, "C4TEXT" exittext = lookup, "C4TEXT"
} }
@ -418,7 +414,6 @@ cluster 8
cluster 9 cluster 9
{ {
flat = "$BGFLAT15" flat = "$BGFLAT15"
music = "$MUSIC_READ_M"
entertext = lookup, "C5TEXT" entertext = lookup, "C5TEXT"
} }
@ -427,7 +422,6 @@ cluster 9
cluster 10 cluster 10
{ {
flat = "$BGFLAT31" flat = "$BGFLAT31"
music = "$MUSIC_READ_M"
entertext = lookup, "C6TEXT" entertext = lookup, "C6TEXT"
} }
@ -537,7 +531,6 @@ map LEVEL09 lookup "NHUSTR_9"
cluster 11 cluster 11
{ {
flat = "SLIME16" flat = "SLIME16"
music = "$MUSIC_READ_M"
exittext = lookup, "NERVETEXT" exittext = lookup, "NERVETEXT"
} }

5
wadsrc/static/mapinfo/heretic.txt
View file

@ -805,35 +805,30 @@ map E6M3 "Untitled"
cluster 1 cluster 1
{ {
flat = "FLOOR25" flat = "FLOOR25"
music = "MUS_CPTD"
exittext = lookup, "HE1TEXT" exittext = lookup, "HE1TEXT"
} }
cluster 2 cluster 2
{ {
flat = "FLATHUH1" flat = "FLATHUH1"
music = "MUS_CPTD"
exittext = lookup, "HE2TEXT" exittext = lookup, "HE2TEXT"
} }
cluster 3 cluster 3
{ {
flat = "FLTWAWA2" flat = "FLTWAWA2"
music = "MUS_CPTD"
exittext = lookup, "HE3TEXT" exittext = lookup, "HE3TEXT"
} }
cluster 4 cluster 4
{ {
flat = "FLOOR28" flat = "FLOOR28"
music = "MUS_CPTD"
exittext = lookup, "HE4TEXT" exittext = lookup, "HE4TEXT"
} }
cluster 5 cluster 5
{ {
flat = "FLOOR08" flat = "FLOOR08"
music = "MUS_CPTD"
exittext = lookup, "HE5TEXT" exittext = lookup, "HE5TEXT"
} }

4
wadsrc/static/mapinfo/hexen.txt
View file

@ -464,7 +464,6 @@ cluster 1
hub hub
exittext = "clus1msg" exittext = "clus1msg"
exittextislump exittextislump
music = "hub"
pic = "interpic" pic = "interpic"
} }
@ -473,7 +472,6 @@ cluster 2
hub hub
exittext = "clus2msg" exittext = "clus2msg"
exittextislump exittextislump
music = "hub"
pic = "interpic" pic = "interpic"
} }
@ -482,7 +480,6 @@ cluster 3
hub hub
exittext = "clus3msg" exittext = "clus3msg"
exittextislump exittextislump
music = "hub"
pic = "interpic" pic = "interpic"
} }
@ -491,7 +488,6 @@ cluster 4
hub hub
exittext = "clus4msg" exittext = "clus4msg"
exittextislump exittextislump
music = "hub"
pic = "interpic" pic = "interpic"
} }

6
wadsrc/static/mapinfo/plutonia.txt
View file

@ -374,7 +374,6 @@ map MAP32 lookup "PHUSTR_32"
cluster 5 cluster 5
{ {
flat = "$BGFLAT06" flat = "$BGFLAT06"
music = "$MUSIC_READ_M"
exittext = lookup, "P1TEXT" exittext = lookup, "P1TEXT"
} }
@ -383,7 +382,6 @@ cluster 5
cluster 6 cluster 6
{ {
flat = "$BGFLAT11" flat = "$BGFLAT11"
music = "$MUSIC_READ_M"
exittext = lookup, "P2TEXT" exittext = lookup, "P2TEXT"
} }
@ -392,7 +390,6 @@ cluster 6
cluster 7 cluster 7
{ {
flat = "$BGFLAT20" flat = "$BGFLAT20"
music = "$MUSIC_READ_M"
exittext = lookup, "P3TEXT" exittext = lookup, "P3TEXT"
} }
@ -401,7 +398,6 @@ cluster 7
cluster 8 cluster 8
{ {
flat = "$BGFLAT30" flat = "$BGFLAT30"
music = "$MUSIC_READ_M"
exittext = lookup, "P4TEXT" exittext = lookup, "P4TEXT"
} }
@ -410,7 +406,6 @@ cluster 8
cluster 9 cluster 9
{ {
flat = "$BGFLAT15" flat = "$BGFLAT15"
music = "$MUSIC_READ_M"
entertext = lookup, "P5TEXT" entertext = lookup, "P5TEXT"
} }
@ -419,7 +414,6 @@ cluster 9
cluster 10 cluster 10
{ {
flat = "$BGFLAT31" flat = "$BGFLAT31"
music = "$MUSIC_READ_M"
entertext = lookup, "P6TEXT" entertext = lookup, "P6TEXT"
} }

6
wadsrc/static/mapinfo/tnt.txt
View file

@ -374,7 +374,6 @@ map MAP32 lookup "THUSTR_32"
cluster 5 cluster 5
{ {
flat = "$BGFLAT06" flat = "$BGFLAT06"
music = "$MUSIC_READ_M"
exittext = lookup, "T1TEXT" exittext = lookup, "T1TEXT"
} }
@ -383,7 +382,6 @@ cluster 5
cluster 6 cluster 6
{ {
flat = "$BGFLAT11" flat = "$BGFLAT11"
music = "$MUSIC_READ_M"
exittext = lookup, "T2TEXT" exittext = lookup, "T2TEXT"
} }
@ -392,7 +390,6 @@ cluster 6
cluster 7 cluster 7
{ {
flat = "$BGFLAT20" flat = "$BGFLAT20"
music = "$MUSIC_READ_M"
exittext = lookup, "T3TEXT" exittext = lookup, "T3TEXT"
} }
@ -401,7 +398,6 @@ cluster 7
cluster 8 cluster 8
{ {
flat = "$BGFLAT30" flat = "$BGFLAT30"
music = "$MUSIC_READ_M"
exittext = lookup, "T4TEXT" exittext = lookup, "T4TEXT"
} }
@ -410,7 +406,6 @@ cluster 8
cluster 9 cluster 9
{ {
flat = "$BGFLAT15" flat = "$BGFLAT15"
music = "$MUSIC_READ_M"
entertext = lookup, "T5TEXT" entertext = lookup, "T5TEXT"
} }
@ -419,6 +414,5 @@ cluster 9
cluster 10 cluster 10
{ {
flat = "$BGFLAT31" flat = "$BGFLAT31"
music = "$MUSIC_READ_M"
entertext = lookup, "T6TEXT" entertext = lookup, "T6TEXT"
} }