Skip to content
Permalink
Browse files

- added a "DeleteLumps" list to IWADINFO

This is for IWADs that contain content which clashes with the engine and must be removed. The primary reason are the unimplemented characters in Raven's BigFont.
  • Loading branch information...
coelckers committed Apr 11, 2019
1 parent 0200edd commit b1ca746af3c9c47b3546ef7df79fa950c62515b6
Showing with 16 additions and 1 deletion.
  1. +10 −0 src/d_iwad.cpp
  2. +1 −0 src/d_main.h
  3. +0 −1 src/gamedata/w_wad.cpp
  4. +5 −0 wadsrc/static/iwadinfo.txt
@@ -155,6 +155,16 @@ void FIWadManager::ParseIWadInfo(const char *fn, const char *data, int datasize,
}
while (sc.CheckString(","));
}
else if (sc.Compare("DeleteLumps"))
{
sc.MustGetStringName("=");
do
{
sc.MustGetString();
iwad->DeleteLumps.Push(FString(sc.String));
}
while (sc.CheckString(","));
}
else if (sc.Compare("BannerColors"))
{
sc.MustGetStringName("=");
@@ -109,6 +109,7 @@ struct FIWADInfo
FString MapInfo; // Base mapinfo to load
TArray<FString> Load; // Wads to be loaded with this one.
TArray<FString> Lumps; // Lump names for identification
TArray<FString> DeleteLumps; // Lumps which must be deleted from the directory.
int flags = 0;
};

@@ -905,7 +905,6 @@ void FWadCollection::RenameSprites ()
LumpInfo[i].lump->Name[0] = 0;
}
}

}
}
}
@@ -183,6 +183,7 @@ IWad
Compatibility = "Poly1"
MustContain = "TITLE", "MAP01", "MAP40", "WINNOWR"
BannerColors = "f0 f0 f0", "6b 3c 18"
DeleteLumps = "FONTB01", "FONTB02", "FONTB03", "FONTB04", "FONTB06", "FONTB08", "FONTB09", "FONTB10", "FONTB11", "FONTB27", "FONTB28", "FONTB29", "FONTB30"
}

IWad
@@ -207,6 +208,7 @@ IWad
Compatibility = "Shareware"
MustContain = "TITLE", "MAP01", "WINNOWR"
BannerColors = "f0 f0 f0", "6b 3c 18"
DeleteLumps = "FONTB01", "FONTB02", "FONTB03", "FONTB04", "FONTB06", "FONTB08", "FONTB09", "FONTB10", "FONTB11", "FONTB27", "FONTB28", "FONTB29", "FONTB30"
}

IWad
@@ -232,6 +234,7 @@ IWad
Compatibility = "Extended"
MustContain = "E1M1", "E2M1", "TITLE", "MUS_E1M1", "EXTENDED"
BannerColors = "fc fc 00", "a8 00 00"
DeleteLumps = "FONTB01", "FONTB02", "FONTB03", "FONTB04", "FONTB06", "FONTB08", "FONTB09", "FONTB10", "FONTB11", "FONTB27", "FONTB28", "FONTB29", "FONTB30"
}

IWad
@@ -244,6 +247,7 @@ IWad
Mapinfo = "mapinfo/heretic.txt"
MustContain = "E1M1", "E2M1", "TITLE", "MUS_E1M1"
BannerColors = "fc fc 00", "a8 00 00"
DeleteLumps = "FONTB01", "FONTB02", "FONTB03", "FONTB04", "FONTB06", "FONTB08", "FONTB09", "FONTB10", "FONTB11", "FONTB27", "FONTB28", "FONTB29", "FONTB30"
}

IWad
@@ -255,6 +259,7 @@ IWad
Compatibility = "Shareware"
MustContain = "E1M1", "TITLE", "MUS_E1M1"
BannerColors = "fc fc 00", "a8 00 00"
DeleteLumps = "FONTB01", "FONTB02", "FONTB03", "FONTB04", "FONTB06", "FONTB08", "FONTB09", "FONTB10", "FONTB11", "FONTB27", "FONTB28", "FONTB29", "FONTB30"
}

IWad

2 comments on commit b1ca746

@Blue-Shadow

This comment has been minimized.

Copy link
Contributor

replied Apr 12, 2019

Where's the code that handles the lump deletion?

@coelckers

This comment has been minimized.

Copy link
Owner Author

replied Apr 12, 2019

Not done yet.

Please sign in to comment.
You can’t perform that action at this time.