- Changed license for r_data.cpp because there isn't anything of id's original
code left in that file. - Cleaned up r_data.cpp. - Fixed: FTextureManager::FindTexture should not print error messages if it doesn't find the texture. - Added Karate Chris's patch for fixing Strife quit messages. SVN r718 (trunk)
This commit is contained in:
parent
499fefec07
commit
5dfc81af36
8 changed files with 199 additions and 102 deletions
|
|
@ -220,6 +220,18 @@ int FTextureManager::GetTexture (const char *name, int usetype, BITFIELD flags)
|
|||
return i;
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// FTextureManager :: FindTexture
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
FTexture *FTextureManager::FindTexture(const char *texname, int usetype, BITFIELD flags)
|
||||
{
|
||||
int texnum = CheckForTexture (texname, usetype, flags);
|
||||
return texnum <= 0? NULL : Textures[texnum].Texture;
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// FTextureManager :: WriteTexture
|
||||
|
|
@ -627,7 +639,8 @@ void FTextureManager::AddPatches (int lumpnum)
|
|||
|
||||
//==========================================================================
|
||||
//
|
||||
// R_InitTextures
|
||||
// FTextureManager :: LoadTexturesX
|
||||
//
|
||||
// Initializes the texture list with the textures from the world map.
|
||||
//
|
||||
//==========================================================================
|
||||
|
|
@ -650,7 +663,7 @@ void FTextureManager::LoadTextureX(int wadnum)
|
|||
|
||||
int texlump1 = Wads.CheckNumForName ("TEXTURE1", ns_global, wadnum);
|
||||
int texlump2 = Wads.CheckNumForName ("TEXTURE2", ns_global, wadnum);
|
||||
TexMan.AddTexturesLumps (texlump1, texlump2, pnames);
|
||||
AddTexturesLumps (texlump1, texlump2, pnames);
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
|
|
@ -779,4 +792,4 @@ void FTextureManager::Init()
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue