Type 606 renderer check allow OGL again
This commit is contained in:
parent
2701976ba3
commit
53733ddf76
|
@ -1471,37 +1471,34 @@ static void P_LoadRawSideDefs2(void *data)
|
||||||
case 606: //SoM: 4/4/2000: Just colormap transfer
|
case 606: //SoM: 4/4/2000: Just colormap transfer
|
||||||
// SoM: R_CreateColormap will only create a colormap in software mode...
|
// SoM: R_CreateColormap will only create a colormap in software mode...
|
||||||
// Perhaps we should just call it instead of doing the calculations here.
|
// Perhaps we should just call it instead of doing the calculations here.
|
||||||
if (rendermode == render_soft || rendermode == render_none)
|
if (
|
||||||
{
|
((rendermode == render_soft || rendermode == render_none) && (msd->toptexture[0] == '#' || msd->bottomtexture[0] == '#'))
|
||||||
if (
|
|
||||||
((rendermode == render_soft || rendermode == render_none) && (msd->toptexture[0] == '#' || msd->bottomtexture[0] == '#'))
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
|| (msd->toptexture[0] == '#' && msd->toptexture[1] && msd->toptexture[2] && msd->toptexture[3] && msd->toptexture[4] && msd->toptexture[5] && msd->toptexture[6])
|
|| (msd->toptexture[0] == '#' && msd->toptexture[1] && msd->toptexture[2] && msd->toptexture[3] && msd->toptexture[4] && msd->toptexture[5] && msd->toptexture[6])
|
||||||
|| (msd->bottomtexture[0] == '#' && msd->bottomtexture[1] && msd->bottomtexture[2] && msd->bottomtexture[3] && msd->bottomtexture[4] && msd->bottomtexture[5] && msd->bottomtexture[6])
|
|| (msd->bottomtexture[0] == '#' && msd->bottomtexture[1] && msd->bottomtexture[2] && msd->bottomtexture[3] && msd->bottomtexture[4] && msd->bottomtexture[5] && msd->bottomtexture[6])
|
||||||
#endif
|
#endif
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
sec->extra_colormap = R_CreateColormap(msd->toptexture, msd->midtexture,
|
sec->extra_colormap = R_CreateColormap(msd->toptexture, msd->midtexture,
|
||||||
msd->bottomtexture);
|
msd->bottomtexture);
|
||||||
sd->toptexture = sd->bottomtexture = 0;
|
sd->toptexture = sd->bottomtexture = 0;
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if ((num = R_CheckTextureNumForName(msd->toptexture)) == -1)
|
|
||||||
sd->toptexture = 0;
|
|
||||||
else
|
|
||||||
sd->toptexture = num;
|
|
||||||
if ((num = R_CheckTextureNumForName(msd->midtexture)) == -1)
|
|
||||||
sd->midtexture = 0;
|
|
||||||
else
|
|
||||||
sd->midtexture = num;
|
|
||||||
if ((num = R_CheckTextureNumForName(msd->bottomtexture)) == -1)
|
|
||||||
sd->bottomtexture = 0;
|
|
||||||
else
|
|
||||||
sd->bottomtexture = num;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if ((num = R_CheckTextureNumForName(msd->toptexture)) == -1)
|
||||||
|
sd->toptexture = 0;
|
||||||
|
else
|
||||||
|
sd->toptexture = num;
|
||||||
|
if ((num = R_CheckTextureNumForName(msd->midtexture)) == -1)
|
||||||
|
sd->midtexture = 0;
|
||||||
|
else
|
||||||
|
sd->midtexture = num;
|
||||||
|
if ((num = R_CheckTextureNumForName(msd->bottomtexture)) == -1)
|
||||||
|
sd->bottomtexture = 0;
|
||||||
|
else
|
||||||
|
sd->bottomtexture = num;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case 413: // Change music
|
case 413: // Change music
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue