diff --git a/arch/ogl/ogl.c b/arch/ogl/ogl.c index f61a015e3..6f5b2f69f 100755 --- a/arch/ogl/ogl.c +++ b/arch/ogl/ogl.c @@ -54,7 +54,6 @@ int GL_TEXTURE_2D_enabled=-1; int GL_texclamp_enabled=-1; extern int gr_renderstats; -extern int gr_badtexture; int ogl_alttexmerge=1;//merge textures by just printing the seperate textures? int ogl_rgba_format=4; int ogl_intensity4_ok=1; @@ -84,8 +83,7 @@ extern GLubyte *texbuf; #define OGL_BINDTEXTURE(a) if(gr_badtexture>0) glBindTexture(GL_TEXTURE_2D, 0);\ else if(a!=lastbound) {glBindTexture(GL_TEXTURE_2D, a);lastbound=a;}*/ -#define OGL_BINDTEXTURE(a) if(gr_badtexture>0) glBindTexture(GL_TEXTURE_2D, 0);\ - else glBindTexture(GL_TEXTURE_2D, a); +#define OGL_BINDTEXTURE(a) glBindTexture(GL_TEXTURE_2D, a); ogl_texture ogl_texture_list[OGL_TEXTURE_LIST_SIZE]; @@ -1410,8 +1408,6 @@ int ogl_loadtexture(unsigned char * data, int dxo,int dyo, ogl_texture *tex, int tex->tw=pow2ize(tex->w);tex->th=pow2ize(tex->h);//calculate smallest texture size that can accomodate us (must be multiples of 2) // tex->tw=tex->w;tex->th=tex->h;//feeling lucky? - if(gr_badtexture>0) return 1; - if (tex_format_verify(tex)) return 1; diff --git a/dxx-changelog.txt b/dxx-changelog.txt index 7d70653a0..d9939cc5d 100755 --- a/dxx-changelog.txt +++ b/dxx-changelog.txt @@ -4,6 +4,7 @@ D1X-Rebirth Changelog -------- main/network.c, main/network.h: fixed player restriction at robot-/coop-games - code cleanup main/hudlog.c: block "You already have"-messages in HudLog output +arch/ogl/ogl.c, main/game.c: removed BADTEXTURE cheat 20070218 -------- diff --git a/main/game.c b/main/game.c index 5498afd8c..6bc0ad4b4 100755 --- a/main/game.c +++ b/main/game.c @@ -2009,8 +2009,6 @@ int cheat_robotpause_index; DEFINE_CHEAT(frametime)={KEY_F, KEY_R, KEY_A, KEY_M, KEY_E, KEY_T, KEY_I, KEY_M, KEY_E}; int gr_renderstats=0; DEFINE_CHEAT(renderstats)={KEY_R, KEY_E, KEY_N, KEY_D, KEY_E, KEY_R, KEY_S, KEY_T, KEY_A, KEY_T, KEY_S}; -int gr_badtexture=0; -DEFINE_CHEAT(badtexture)={KEY_B, KEY_A, KEY_D, KEY_T, KEY_E, KEY_X, KEY_T, KEY_U, KEY_R, KEY_E}; int Cheats_enabled=0; extern int Laser_rapid_fire, Ugly_robot_cheat; @@ -2485,7 +2483,6 @@ void ReadControls() #ifdef FINAL_CHEATS IMPLEMENT_CHEAT(frametime,framerate_on = !framerate_on;); IMPLEMENT_CHEAT(renderstats,gr_renderstats = !gr_renderstats;); - IMPLEMENT_CHEAT(badtexture,gr_badtexture = !gr_badtexture;); if (Cheats_enabled) { if (!(Game_mode&GM_MULTI) && key == cheat_wowie[cheat_wowie_index]) { if (++cheat_wowie_index == CHEAT_WOWIE_LENGTH) {