From 9d80b4394e06f84897999b4415e3f5cba0953161 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Oct 2000 19:32:30 +0000
Subject: [PATCH] cl_main.c: 	what was id trying to hide? oh well, it's
 clear now :) gl_draw.c: 	missed a value->int_val conversion

---
 source/cl_main.c | 29 +++++------------------------
 source/gl_draw.c |  2 +-
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/source/cl_main.c b/source/cl_main.c
index bf60bbe..a710b40 100644
--- a/source/cl_main.c
+++ b/source/cl_main.c
@@ -183,19 +183,11 @@ void Master_Connect_f (void);
 
 char	*server_version = NULL;	// version of server we connected to
 
-char emodel_name[] = 
-	{ 'e' ^ 0xff, 'm' ^ 0xff, 'o' ^ 0xff, 'd' ^ 0xff, 'e' ^ 0xff, 'l' ^ 0xff, 0 };
-char pmodel_name[] = 
-	{ 'p' ^ 0xff, 'm' ^ 0xff, 'o' ^ 0xff, 'd' ^ 0xff, 'e' ^ 0xff, 'l' ^ 0xff, 0 };
-char prespawn_name[] = 
-	{ 'p'^0xff, 'r'^0xff, 'e'^0xff, 's'^0xff, 'p'^0xff, 'a'^0xff, 'w'^0xff, 'n'^0xff,
-		' '^0xff, '%'^0xff, 'i'^0xff, ' '^0xff, '0'^0xff, ' '^0xff, '%'^0xff, 'i'^0xff, 0 };
-char modellist_name[] = 
-	{ 'm'^0xff, 'o'^0xff, 'd'^0xff, 'e'^0xff, 'l'^0xff, 'l'^0xff, 'i'^0xff, 's'^0xff, 't'^0xff, 
-		' '^0xff, '%'^0xff, 'i'^0xff, ' '^0xff, '%'^0xff, 'i'^0xff, 0 };
-char soundlist_name[] = 
-	{ 's'^0xff, 'o'^0xff, 'u'^0xff, 'n'^0xff, 'd'^0xff, 'l'^0xff, 'i'^0xff, 's'^0xff, 't'^0xff, 
-		' '^0xff, '%'^0xff, 'i'^0xff, ' '^0xff, '%'^0xff, 'i'^0xff, 0 };
+char emodel_name[] = "emodel";
+char pmodel_name[] = "pmodel";
+char prespawn_name[] = "prespawn %i 0 %i";
+char modellist_name[] = "modellist %i %i";
+char soundlist_name[] = "soundlist %i %i";
 
 /*
 ==================
@@ -1580,15 +1572,6 @@ static void simple_crypt(char *buf, int len)
 		*buf++ ^= 0xff;
 }
 
-void Host_FixupModelNames(void)
-{
-	simple_crypt(emodel_name, sizeof(emodel_name) - 1);
-	simple_crypt(pmodel_name, sizeof(pmodel_name) - 1);
-	simple_crypt(prespawn_name,  sizeof(prespawn_name)  - 1);
-	simple_crypt(modellist_name, sizeof(modellist_name) - 1);
-	simple_crypt(soundlist_name, sizeof(soundlist_name) - 1);
-}
-
 //============================================================================
 
 /*
@@ -1645,8 +1628,6 @@ void Host_Init (quakeparms_t *parms)
 	//Cmd_StuffCmds_f ();
 	//Cbuf_Execute ();
 
-	Host_FixupModelNames();
-	
 	NET_Init (PORT_CLIENT);
 	Netchan_Init ();
 
diff --git a/source/gl_draw.c b/source/gl_draw.c
index ce14e0d..a9ed9b3 100644
--- a/source/gl_draw.c
+++ b/source/gl_draw.c
@@ -771,7 +771,7 @@ Draw_ConsoleBackground ( int lines )
 	}
 
 	// slide console up/down or stretch it?
-	if (gl_constretch->value)
+	if (gl_constretch->int_val)
 		ofs = 0;
 	else
 		ofs = (vid.conheight - lines)/(float)vid.conheight;