mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-26 03:30:46 +00:00
Mapster32: don't use lazy tile loading with r_hightile=0.
git-svn-id: https://svn.eduke32.com/eduke32@2345 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
b04e743236
commit
17ba2664f9
1 changed files with 7 additions and 6 deletions
|
@ -4200,6 +4200,7 @@ static int32_t DrawTiles(int32_t iTopLeft, int32_t iSelected, int32_t nXTiles, i
|
||||||
const char *pRawPixels;
|
const char *pRawPixels;
|
||||||
char szT[128];
|
char szT[128];
|
||||||
|
|
||||||
|
int32_t lazyselector = g_lazy_tileselector && usehightile;
|
||||||
int32_t runi=0, usehitile;
|
int32_t runi=0, usehitile;
|
||||||
static uint8_t loadedhitile[(MAXTILES+7)>>3];
|
static uint8_t loadedhitile[(MAXTILES+7)>>3];
|
||||||
|
|
||||||
|
@ -4210,7 +4211,7 @@ static int32_t DrawTiles(int32_t iTopLeft, int32_t iSelected, int32_t nXTiles, i
|
||||||
{
|
{
|
||||||
bglEnable(GL_TEXTURE_2D);
|
bglEnable(GL_TEXTURE_2D);
|
||||||
|
|
||||||
if (g_lazy_tileselector)
|
if (lazyselector)
|
||||||
bglDrawBuffer(GL_FRONT_AND_BACK);
|
bglDrawBuffer(GL_FRONT_AND_BACK);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -4227,7 +4228,7 @@ restart:
|
||||||
|
|
||||||
if (iTile < 0 || iTile >= localartlookupnum)
|
if (iTile < 0 || iTile >= localartlookupnum)
|
||||||
continue;
|
continue;
|
||||||
usehitile = (runi || !g_lazy_tileselector);
|
usehitile = (runi || !lazyselector);
|
||||||
|
|
||||||
idTile = localartlookup[ iTile ];
|
idTile = localartlookup[ iTile ];
|
||||||
if (loadedhitile[idTile>>3]&(1<<(idTile&7)))
|
if (loadedhitile[idTile>>3]&(1<<(idTile&7)))
|
||||||
|
@ -4259,7 +4260,7 @@ restart:
|
||||||
|
|
||||||
tilescreen_drawbox(iTopLeft, iSelected, nXTiles, TileDim, offset, iTile, idTile);
|
tilescreen_drawbox(iTopLeft, iSelected, nXTiles, TileDim, offset, iTile, idTile);
|
||||||
|
|
||||||
if (runi==1 && g_lazy_tileselector)
|
if (runi==1 && lazyselector)
|
||||||
{
|
{
|
||||||
int32_t k;
|
int32_t k;
|
||||||
|
|
||||||
|
@ -4281,7 +4282,7 @@ restart:
|
||||||
enddrawing();
|
enddrawing();
|
||||||
showframe(1);
|
showframe(1);
|
||||||
#ifdef USE_OPENGL
|
#ifdef USE_OPENGL
|
||||||
if (rendmode >= 3 && g_lazy_tileselector)
|
if (rendmode >= 3 && lazyselector)
|
||||||
bglDrawBuffer(GL_BACK);
|
bglDrawBuffer(GL_BACK);
|
||||||
#endif
|
#endif
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -4296,7 +4297,7 @@ restart:
|
||||||
|
|
||||||
tilescreen_drawrest(iSelected, showmsg);
|
tilescreen_drawrest(iSelected, showmsg);
|
||||||
|
|
||||||
if (getrendermode()>=3 && qsetmode==200 && g_lazy_tileselector)
|
if (getrendermode()>=3 && qsetmode==200 && lazyselector)
|
||||||
{
|
{
|
||||||
if (runi==0)
|
if (runi==0)
|
||||||
{
|
{
|
||||||
|
@ -4313,7 +4314,7 @@ restart:
|
||||||
showframe(1);
|
showframe(1);
|
||||||
|
|
||||||
#ifdef USE_OPENGL
|
#ifdef USE_OPENGL
|
||||||
if (rendmode >= 3 && g_lazy_tileselector)
|
if (rendmode >= 3 && lazyselector)
|
||||||
bglDrawBuffer(GL_BACK);
|
bglDrawBuffer(GL_BACK);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue