zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a few cases when IWAD was checked by hardcoded index

Browse source
This commit is contained in:
alexey.lysiuk 2017-10-21 11:10:36 +03:00
parent 13584b9a9d
commit 724d711d1f
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_game.cpp
View file

@ -2193,7 +2193,7 @@ static void PutSaveWads (FSerializer &arc)
arc.AddString("Game WAD", name); arc.AddString("Game WAD", name);
// Name of wad the map resides in // Name of wad the map resides in
if (Wads.GetLumpFile (level.lumpnum) > 1) if (Wads.GetLumpFile (level.lumpnum) > Wads.GetIwadNum())
{ {
name = Wads.GetWadName (Wads.GetLumpFile (level.lumpnum)); name = Wads.GetWadName (Wads.GetLumpFile (level.lumpnum));
arc.AddString("Map WAD", name); arc.AddString("Map WAD", name);

2
src/gl/data/gl_data.cpp
View file

@ -87,7 +87,7 @@ void AdjustSpriteOffsets()
for (int i = 0; i < numtex; i++) for (int i = 0; i < numtex; i++)
{ {
if (Wads.GetLumpFile(i) > 1) break; // we are past the IWAD if (Wads.GetLumpFile(i) > Wads.GetIwadNum()) break; // we are past the IWAD
if (Wads.GetLumpNamespace(i) == ns_sprites && Wads.GetLumpFile(i) == Wads.GetIwadNum()) if (Wads.GetLumpNamespace(i) == ns_sprites && Wads.GetLumpFile(i) == Wads.GetIwadNum())
{ {
char str[9]; char str[9];

2
src/intermission/intermission_parse.cpp
View file

@ -299,7 +299,7 @@ bool FIntermissionActionTextscreen::ParseKey(FScanner &sc)
else else
{ {
// only print an error if coming from a PWAD // only print an error if coming from a PWAD
if (Wads.GetLumpFile(sc.LumpNum) > 1) if (Wads.GetLumpFile(sc.LumpNum) > Wads.GetIwadNum())
sc.ScriptMessage("Unknown text lump '%s'", sc.String); sc.ScriptMessage("Unknown text lump '%s'", sc.String);
mText.Format("Unknown text lump '%s'", sc.String); mText.Format("Unknown text lump '%s'", sc.String);
} }

2
src/v_font.cpp
View file

@ -2361,7 +2361,7 @@ void V_InitFontColors ()
// which are used by the menu. So we have no choice but to skip this lump so that // which are used by the menu. So we have no choice but to skip this lump so that
// all colors work properly. // all colors work properly.
// The text colors should be the end user's choice anyway. // The text colors should be the end user's choice anyway.
if (Wads.GetLumpFile(lump) == 1) continue; if (Wads.GetLumpFile(lump) == Wads.GetIwadNum()) continue;
} }
FScanner sc(lump); FScanner sc(lump);
while (sc.GetString()) while (sc.GetString())