X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=keys.c;h=91f4f55c52013dc52f974ad7b621c8173c510f20;hb=2abc4da09326107ad1c263ff81f022836c43001f;hp=20211e7d1df49729f6169f0539a8ea96b1371eae;hpb=8ea8ee92cdbbeb593e424ae3985ac8de766bafa4;p=xonotic%2Fdarkplaces.git

diff --git a/keys.c b/keys.c
index 20211e7d..91f4f55c 100644
--- a/keys.c
+++ b/keys.c
@@ -14,7 +14,7 @@
 
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, write to:
-	
+
 		Free Software Foundation, Inc.
 		59 Temple Place - Suite 330
 		Boston, MA  02111-1307, USA
@@ -319,10 +319,7 @@ Key_Console (int key, char ascii)
 		key_linepos = 1;
 		// force an update, because the command may take some time
 		if (cls.state == ca_disconnected)
-		{
 			CL_UpdateScreen ();
-			CL_UpdateScreen ();
-		}
 		return;
 	}
 
@@ -432,7 +429,7 @@ Key_Console (int key, char ascii)
 
 	if (key == K_PGUP || key == K_KP_PGUP || key == K_MWHEELUP)
 	{
-		con_backscroll += ((int) scr_conlines >> 4);
+		con_backscroll += ((int) vid.conheight >> 5);
 		if (con_backscroll > con_totallines - (vid.conheight>>3) - 1)
 			con_backscroll = con_totallines - (vid.conheight>>3) - 1;
 		return;
@@ -440,7 +437,7 @@ Key_Console (int key, char ascii)
 
 	if (key == K_PGDN || key == K_KP_PGDN || key == K_MWHEELDOWN)
 	{
-		con_backscroll -= ((int) scr_conlines >> 4);
+		con_backscroll -= ((int) vid.conheight >> 5);
 		if (con_backscroll < 0)
 			con_backscroll = 0;
 		return;
@@ -914,14 +911,6 @@ Key_Event (int key, char ascii, qboolean down)
 		return;
 	}
 
-	// console key is hardcoded, so the user can never unbind it
-	if (key == '`' || key == '~')
-	{
-		if (down)
-			Con_ToggleConsole_f ();
-		return;
-	}
-
 	if (down)
 	{
 		if (!(kb = keybindings[key_bmap][key]))
@@ -950,7 +939,7 @@ Key_Event (int key, char ascii, qboolean down)
 				kb = keybindings[key_bmap2][key];
 
 			if (kb && kb[0] == '+') {
-				snprintf (cmd, sizeof(cmd), "-%s %i\n", kb + 1, key);
+				dpsnprintf (cmd, sizeof(cmd), "-%s %i\n", kb + 1, key);
 				Cbuf_AddText (cmd);
 			}
 			return;
@@ -975,7 +964,7 @@ Key_Event (int key, char ascii, qboolean down)
 				kb = keybindings[key_bmap2][key];
 			if (kb) {
 				if (kb[0] == '+') {			// button commands add keynum as a parm
-					snprintf (cmd, sizeof(cmd), "%s %i\n", kb, key);
+					dpsnprintf (cmd, sizeof(cmd), "%s %i\n", kb, key);
 					Cbuf_AddText (cmd);
 				} else {
 					Cbuf_AddText (kb);