use linear mapping for the gametype icons and fixed c&p error

This commit is contained in:
oy 2018-12-01 12:47:14 +01:00
parent 9b6db9b26c
commit 0e655437c9
3 changed files with 3 additions and 3 deletions

View file

@ -360,7 +360,7 @@ IGraphics::CTextureHandle CGraphics_Threaded::LoadTextureRaw(int Width, int Heig
}
if(Flags&IGraphics::TEXLOAD_MULTI_DIMENSION)
Cmd.m_Flags |= CCommandBuffer::TEXFLAG_TEXTURE3D;
if(Flags&IGraphics::TEXLOAD_NOMIPMAPS)
if(Flags&IGraphics::TEXLOAD_LINEARMIPMAPS)
Cmd.m_Flags |= CCommandBuffer::TEXTFLAG_LINEARMIPMAPS;

View file

@ -2164,7 +2164,7 @@ int CMenus::GameIconScan(const char *pName, int IsDir, int DirType, void *pUser)
str_format(aBuf, sizeof(aBuf), "loaded gametype icon '%s'", aGameIconName);
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "game", aBuf);
GameIcon.m_IconTexture = pSelf->Graphics()->LoadTextureRaw(Info.m_Width, Info.m_Height, Info.m_Format, Info.m_pData, Info.m_Format, 0);
GameIcon.m_IconTexture = pSelf->Graphics()->LoadTextureRaw(Info.m_Width, Info.m_Height, Info.m_Format, Info.m_pData, Info.m_Format, IGraphics::TEXLOAD_LINEARMIPMAPS);
pSelf->m_lGameIcons.add(GameIcon);
if(!str_comp_nocase(aGameIconName, "mod"))
pSelf->m_GameIconDefault = GameIcon.m_IconTexture;

View file

@ -283,7 +283,7 @@ void CGameClient::OnInit()
// setup load amount// load textures
for(int i = 0; i < g_pData->m_NumImages; i++)
{
g_pData->m_aImages[i].m_Id = Graphics()->LoadTexture(g_pData->m_aImages[i].m_pFilename, IStorage::TYPE_ALL, CImageInfo::FORMAT_AUTO, g_pData->m_aImages[i].m_Flag ? IGraphics::TEXLOAD_NOMIPMAPS : 0);
g_pData->m_aImages[i].m_Id = Graphics()->LoadTexture(g_pData->m_aImages[i].m_pFilename, IStorage::TYPE_ALL, CImageInfo::FORMAT_AUTO, g_pData->m_aImages[i].m_Flag ? IGraphics::TEXLOAD_LINEARMIPMAPS : 0);
m_pMenus->RenderLoading();
}