Invert sense of DbgAltTexMerge
This commit is contained in:
parent
761795e4c8
commit
e30f548d60
|
@ -104,7 +104,7 @@ typedef struct Arg
|
||||||
int DbgNoCompressPigBitmap;
|
int DbgNoCompressPigBitmap;
|
||||||
int DbgBpp;
|
int DbgBpp;
|
||||||
#ifdef OGL
|
#ifdef OGL
|
||||||
int DbgAltTexMerge;
|
int DbgUseOldTextureMerge;
|
||||||
int DbgGlIntensity4Ok;
|
int DbgGlIntensity4Ok;
|
||||||
int DbgGlLuminance4Alpha4Ok;
|
int DbgGlLuminance4Alpha4Ok;
|
||||||
int DbgGlRGBA2Ok;
|
int DbgGlRGBA2Ok;
|
||||||
|
|
|
@ -432,7 +432,7 @@ void ogl_cache_level_textures(void)
|
||||||
if (tmap2 != 0){
|
if (tmap2 != 0){
|
||||||
PIGGY_PAGE_IN(Textures[tmap2&0x3FFF]);
|
PIGGY_PAGE_IN(Textures[tmap2&0x3FFF]);
|
||||||
bm2 = &GameBitmaps[Textures[tmap2&0x3FFF].index];
|
bm2 = &GameBitmaps[Textures[tmap2&0x3FFF].index];
|
||||||
if (GameArg.DbgAltTexMerge == 0 || (bm2->bm_flags & BM_FLAG_SUPER_TRANSPARENT))
|
if (GameArg.DbgUseOldTextureMerge || (bm2->bm_flags & BM_FLAG_SUPER_TRANSPARENT))
|
||||||
bm = texmerge_get_cached_bitmap( tmap1, tmap2 );
|
bm = texmerge_get_cached_bitmap( tmap1, tmap2 );
|
||||||
else {
|
else {
|
||||||
ogl_loadbmtexture(bm2);
|
ogl_loadbmtexture(bm2);
|
||||||
|
|
|
@ -258,7 +258,7 @@ static void render_face(int segnum, int sidenum, int nv, int *vp, int tmap1, int
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef OGL
|
#ifdef OGL
|
||||||
if (GameArg.DbgAltTexMerge){
|
if (!GameArg.DbgUseOldTextureMerge){
|
||||||
PIGGY_PAGE_IN(Textures[tmap1]);
|
PIGGY_PAGE_IN(Textures[tmap1]);
|
||||||
bm = &GameBitmaps[Textures[tmap1].index];
|
bm = &GameBitmaps[Textures[tmap1].index];
|
||||||
if (tmap2){
|
if (tmap2){
|
||||||
|
|
|
@ -197,7 +197,7 @@ static void ReadCmdArgs(void)
|
||||||
GameArg.DbgBpp = (FindArg("-16bpp") ? 16 : 32);
|
GameArg.DbgBpp = (FindArg("-16bpp") ? 16 : 32);
|
||||||
|
|
||||||
#ifdef OGL
|
#ifdef OGL
|
||||||
GameArg.DbgAltTexMerge = !FindArg("-gl_oldtexmerge");
|
GameArg.DbgUseOldTextureMerge = FindArg("-gl_oldtexmerge");
|
||||||
GameArg.DbgGlIntensity4Ok = get_int_arg("-gl_intensity4_ok", 1);
|
GameArg.DbgGlIntensity4Ok = get_int_arg("-gl_intensity4_ok", 1);
|
||||||
GameArg.DbgGlLuminance4Alpha4Ok = get_int_arg("-gl_luminance4_alpha4_ok", 1);
|
GameArg.DbgGlLuminance4Alpha4Ok = get_int_arg("-gl_luminance4_alpha4_ok", 1);
|
||||||
GameArg.DbgGlRGBA2Ok = get_int_arg("-gl_rgba2_ok", 1);
|
GameArg.DbgGlRGBA2Ok = get_int_arg("-gl_rgba2_ok", 1);
|
||||||
|
|
Loading…
Reference in a new issue