- Got rid of most TexMan.AddPatch calls because they are no longer needed.
- Got rid of R_InitPatches because the new texture init code needs to preload everything to work correctly. - Rewrote texture manager initialization to order textures primarily by WAD rather than by type. This way later textures will always override earlier ones. The only exception is that TEX_MiscPatch are only used as a fallback if nothing else can be found. - Optimized the tryany case of FTextureManager::CheckForTexture. It is not necessary to scan the hash chain twice. The required information can be retrieved during the first pass as easily and even offers a little more control. - Made FFont destructor virtual. - Added 'Ice' translation to DECORATE. (Caution: Not fully tested yet!) SVN r715 (trunk)
This commit is contained in:
parent
58816f5d09
commit
1b28557341
20 changed files with 1430 additions and 1364 deletions
|
|
@ -1157,7 +1157,6 @@ static void ParseEpisodeInfo (FScanner &sc)
|
|||
bool picisgfx = false; // Shut up, GCC!!!!
|
||||
bool remove = false;
|
||||
char key = 0;
|
||||
bool addedgfx = false;
|
||||
bool noskill = false;
|
||||
|
||||
// Get map name
|
||||
|
|
@ -1264,15 +1263,6 @@ static void ParseEpisodeInfo (FScanner &sc)
|
|||
EpisodeMenu[i].fulltext = !picisgfx;
|
||||
EpisodeNoSkill[i] = noskill;
|
||||
strncpy (EpisodeMaps[i], map, 8);
|
||||
|
||||
if (picisgfx)
|
||||
{
|
||||
if (TexMan.CheckForTexture (pic, FTexture::TEX_MiscPatch, 0) == -1)
|
||||
{
|
||||
TexMan.AddPatch (pic);
|
||||
addedgfx = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue