[Fixed] GLDEFS "thiswad" handler broken

[Gez]

Brightmap definitions with the "thiswad" keyword do not work. From best I can tell, this seems due to what looks like a mistake here:

Code: Select all • Expand view

      if (thiswad || iwad)
      {
         bool useme = false;
         int lumpnum = tex->GetSourceLump();

         if (lumpnum != -1)
         {
            if (iwad && fileSystem.GetFileContainer(lumpnum) <= fileSystem.GetMaxIwadNum()) useme = true;
            if (thiswad && fileSystem.GetFileContainer(lumpnum) == workingLump) useme = true;
         }
         if (!useme) return;
      }

You'll notice it's apparently trying to compare a file with a lump. I suppose it should be

Code: Select all • Expand view

            if (thiswad && fileSystem.GetFileContainer(lumpnum) == fileSystem.GetFileContainer(workingLump)) useme = true;


[Warden]

Would love to see this fixed for the sake of autoloading brightmaps in combination with sprite fixes.

[drfrag]

But the same comparison is also present in void ParseMaterial() not only in void ParseBrightmap().
The code in the legacy build is pretty much the same:

Code: Select all • Expand view

      if (thiswad || iwad)
      {
         bool useme = false;
         int lumpnum = tex->GetSourceLump();

         if (lumpnum != -1)
         {
            if (iwad && Wads.GetLumpFile(lumpnum) <= Wads.GetIwadNum()) useme = true;
            if (thiswad && Wads.GetLumpFile(lumpnum) == workingLump) useme = true;
         }
         if (!useme) return;
      }


Since when does this happen?

[Gez]

I dunno, but it didn't work.
viewtopic.php?f=122&t=72675

[drfrag]

Okay but how can i test this? You said it worked in an older version but which one? That code is very old and the functions are equivalent (minus the materials part).
I guess the other check in ParseMaterial needs to be replaced too becouse it's the same.

[drfrag]

I've tested REKKR and now it works. The check for materials is still wrong upstream.