diff --git a/common/include/args.h b/common/include/args.h index df7624005..fe2be3a98 100644 --- a/common/include/args.h +++ b/common/include/args.h @@ -104,7 +104,7 @@ typedef struct Arg int DbgNoCompressPigBitmap; int DbgBpp; #ifdef OGL - int DbgAltTexMerge; + int DbgUseOldTextureMerge; int DbgGlIntensity4Ok; int DbgGlLuminance4Alpha4Ok; int DbgGlRGBA2Ok; diff --git a/similar/arch/ogl/ogl.cpp b/similar/arch/ogl/ogl.cpp index 86b96e93f..a8a849593 100644 --- a/similar/arch/ogl/ogl.cpp +++ b/similar/arch/ogl/ogl.cpp @@ -432,7 +432,7 @@ void ogl_cache_level_textures(void) if (tmap2 != 0){ PIGGY_PAGE_IN(Textures[tmap2&0x3FFF]); 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 ); else { ogl_loadbmtexture(bm2); diff --git a/similar/main/render.cpp b/similar/main/render.cpp index f9042c88a..3bbdf7090 100644 --- a/similar/main/render.cpp +++ b/similar/main/render.cpp @@ -258,7 +258,7 @@ static void render_face(int segnum, int sidenum, int nv, int *vp, int tmap1, int } #ifdef OGL - if (GameArg.DbgAltTexMerge){ + if (!GameArg.DbgUseOldTextureMerge){ PIGGY_PAGE_IN(Textures[tmap1]); bm = &GameBitmaps[Textures[tmap1].index]; if (tmap2){ diff --git a/similar/misc/args.cpp b/similar/misc/args.cpp index 677f2fd99..00a99baa3 100644 --- a/similar/misc/args.cpp +++ b/similar/misc/args.cpp @@ -197,7 +197,7 @@ static void ReadCmdArgs(void) GameArg.DbgBpp = (FindArg("-16bpp") ? 16 : 32); #ifdef OGL - GameArg.DbgAltTexMerge = !FindArg("-gl_oldtexmerge"); + GameArg.DbgUseOldTextureMerge = FindArg("-gl_oldtexmerge"); GameArg.DbgGlIntensity4Ok = get_int_arg("-gl_intensity4_ok", 1); GameArg.DbgGlLuminance4Alpha4Ok = get_int_arg("-gl_luminance4_alpha4_ok", 1); GameArg.DbgGlRGBA2Ok = get_int_arg("-gl_rgba2_ok", 1);