From b636db40824c8528f92b437376c424c164971ac5 Mon Sep 17 00:00:00 2001
From: g-cont <g-cont@rambler.ru>
Date: Mon, 6 Apr 2015 00:00:00 +0300
Subject: [PATCH] 06 Apr 2015

---
 engine/client/gl_backend.c | 6 ++----
 engine/client/gl_image.c   | 4 ++--
 engine/client/gl_vidnt.c   | 2 +-
 engine/common/keys.c       | 5 +++++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/engine/client/gl_backend.c b/engine/client/gl_backend.c
index abedf935..95948f37 100644
--- a/engine/client/gl_backend.c
+++ b/engine/client/gl_backend.c
@@ -377,32 +377,30 @@ void GL_FrontFace( GLenum front )
 
 void GL_SetRenderMode( int mode )
 {
+	pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
+
 	switch( mode )
 	{
 	case kRenderNormal:
 	default:
 		pglDisable( GL_BLEND );
 		pglDisable( GL_ALPHA_TEST );
-		pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE );
 		break;
 	case kRenderTransColor:
 	case kRenderTransTexture:
 		pglEnable( GL_BLEND );
 		pglDisable( GL_ALPHA_TEST );
 		pglBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
-		pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
 		break;
 	case kRenderTransAlpha:
 		pglDisable( GL_BLEND );
 		pglEnable( GL_ALPHA_TEST );
-		pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
 		break;
 	case kRenderGlow:
 	case kRenderTransAdd:
 		pglEnable( GL_BLEND );
 		pglDisable( GL_ALPHA_TEST );
 		pglBlendFunc( GL_SRC_ALPHA, GL_ONE );
-		pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
 		break;
 	}
 }
diff --git a/engine/client/gl_image.c b/engine/client/gl_image.c
index 546240ad..b33ff1ff 100644
--- a/engine/client/gl_image.c
+++ b/engine/client/gl_image.c
@@ -722,7 +722,7 @@ static GLenum GL_TextureFormat( gltexture_t *tex, int *samples )
 		case 1: format = GL_LUMINANCE8; break;
 		case 2: format = GL_LUMINANCE8_ALPHA8; break;
 		case 3:
-			if( gl_luminance_textures->integer )
+			if( gl_luminance_textures->integer && !( tex->flags & TF_UNCOMPRESSED ))
 			{
 				switch( bits )
 				{
@@ -744,7 +744,7 @@ static GLenum GL_TextureFormat( gltexture_t *tex, int *samples )
 			break;		
 		case 4:
 		default:
-			if( gl_luminance_textures->integer )
+			if( gl_luminance_textures->integer && !( tex->flags & TF_UNCOMPRESSED ))
 			{
 				switch( bits )
 				{
diff --git a/engine/client/gl_vidnt.c b/engine/client/gl_vidnt.c
index be2c8b30..2b9eeea9 100644
--- a/engine/client/gl_vidnt.c
+++ b/engine/client/gl_vidnt.c
@@ -693,7 +693,7 @@ qboolean GL_CreateContext( void )
 	if(!( pwglMakeCurrent( glw_state.hDC, glw_state.hGLRC )))
 		return GL_DeleteContext();
 
-	if( host.developer <= 1 )
+	if( !Sys_CheckParm( "-gldebug" ) || host.developer < 1 ) // debug bit the kills perfomance
 		return true;
 
 	pwglCreateContextAttribsARB = GL_GetProcAddress( "wglCreateContextAttribsARB" );
diff --git a/engine/common/keys.c b/engine/common/keys.c
index 1e2fa3ca..952e8b2f 100644
--- a/engine/common/keys.c
+++ b/engine/common/keys.c
@@ -551,11 +551,16 @@ void Key_Event( int key, qboolean down )
 	// escape is always handled special
 	if( key == K_ESCAPE && down )
 	{
+		kb = keys[key].binding;
+
 		switch( cls.key_dest )
 		{
 		case key_game:
 			if( host.mouse_visible && cls.state != ca_cinematic )
+			{
+				clgame.dllFuncs.pfnKey_Event( down, key, keys[key].binding );
 				return; // handled in client.dll
+			}
 			break;
 		case key_message:
 			Key_Message( key );