Added sprint bind to ingame controls

2 files changed, 3701 insertions, 3683 deletions

diff --git a/src/ui/ui_shared.c b/src/ui/ui_shared.c
index 6ef8bb53..8f0a60f0 100644
--- a/src/ui/ui_shared.c
+++ b/src/ui/ui_shared.c
@@ -16,20 +16,20 @@
 
 #include "ui_shared.h"
 
-#define SCROLL_TIME_START					500
-#define SCROLL_TIME_ADJUST				150
-#define SCROLL_TIME_ADJUSTOFFSET	40
-#define SCROLL_TIME_FLOOR					20
+#define SCROLL_TIME_START         500
+#define SCROLL_TIME_ADJUST        150
+#define SCROLL_TIME_ADJUSTOFFSET  40
+#define SCROLL_TIME_FLOOR         20
 
 typedef struct scrollInfo_s {
-	int nextScrollTime;
-	int nextAdjustTime;
-	int adjustValue;
-	int scrollKey;
-	float xStart;
-	float yStart;
-	itemDef_t *item;
-	qboolean scrollDir;
+  int nextScrollTime;
+  int nextAdjustTime;
+  int adjustValue;
+  int scrollKey;
+  float xStart;
+  float yStart;
+  itemDef_t *item;
+  qboolean scrollDir;
 } scrollInfo_t;
 
 static scrollInfo_t scrollInfo;
@@ -77,31 +77,31 @@ static qboolean Menu_OverActiveItem(menuDef_t *menu, float x, float y);
 #endif
 
 //TA: hacked variable name to avoid conflict with new cgame Alloc
-static char		UI_memoryPool[MEM_POOL_SIZE];
-static int		allocPoint, outOfMemory;
+static char   UI_memoryPool[MEM_POOL_SIZE];
+static int    allocPoint, outOfMemory;
 
 /*
 ===============
 UI_Alloc
 ===============
-*/				  
+*/          
 void *UI_Alloc( int size ) {
-	char	*p; 
+  char  *p; 
 
-	if ( allocPoint + size > MEM_POOL_SIZE ) {
-		outOfMemory = qtrue;
-		if (DC->Print) {
-			DC->Print("UI_Alloc: Failure. Out of memory!\n");
-		}
+  if ( allocPoint + size > MEM_POOL_SIZE ) {
+    outOfMemory = qtrue;
+    if (DC->Print) {
+      DC->Print("UI_Alloc: Failure. Out of memory!\n");
+    }
     //DC->trap_Print(S_COLOR_YELLOW"WARNING: UI Out of Memory!\n");
-		return NULL;
-	}
+    return NULL;
+  }
 
-	p = &UI_memoryPool[allocPoint];
+  p = &UI_memoryPool[allocPoint];
 
-	allocPoint += ( size + 15 ) & ~15;
+  allocPoint += ( size + 15 ) & ~15;
 
-	return p;
+  return p;
 }
 
 /*
@@ -110,12 +110,12 @@ UI_InitMemory
 ===============
 */
 void UI_InitMemory( void ) {
-	allocPoint = 0;
-	outOfMemory = qfalse;
+  allocPoint = 0;
+  outOfMemory = qfalse;
 }
 
 qboolean UI_OutOfMemory() {
-	return outOfMemory;
+  return outOfMemory;
 }
 
 
@@ -129,24 +129,24 @@ return a hash value for the string
 ================
 */
 static long hashForString(const char *str) {
-	int		i;
-	long	hash;
-	char	letter;
-
-	hash = 0;
-	i = 0;
-	while (str[i] != '\0') {
-		letter = tolower(str[i]);
-		hash+=(long)(letter)*(i+119);
-		i++;
-	}
-	hash &= (HASH_TABLE_SIZE-1);
-	return hash;
+  int   i;
+  long  hash;
+  char  letter;
+
+  hash = 0;
+  i = 0;
+  while (str[i] != '\0') {
+    letter = tolower(str[i]);
+    hash+=(long)(letter)*(i+119);
+    i++;
+  }
+  hash &= (HASH_TABLE_SIZE-1);
+  return hash;
 }
 
 typedef struct stringDef_s {
-	struct stringDef_s *next;
-	const char *str;
+  struct stringDef_s *next;
+  const char *str;
 } stringDef_t;
 
 static int strPoolIndex = 0;
@@ -157,67 +157,67 @@ static stringDef_t *strHandle[HASH_TABLE_SIZE];
 
 
 const char *String_Alloc(const char *p) {
-	int len;
-	long hash;
-	stringDef_t *str, *last;
-	static const char *staticNULL = "";
-
-	if (p == NULL) {
-		return NULL;
-	}
-
-	if (*p == 0) {
-		return staticNULL;
-	}
-
-	hash = hashForString(p);
-
-	str = strHandle[hash];
-	while (str) {
-		if (strcmp(p, str->str) == 0) {
-			return str->str;
-		}
-		str = str->next;
-	}
-
-	len = strlen(p);
-	if (len + strPoolIndex + 1 < STRING_POOL_SIZE) {
-		int ph = strPoolIndex;
-		strcpy(&strPool[strPoolIndex], p);
-		strPoolIndex += len + 1;
-
-		str = strHandle[hash];
-		last = str;
-		while (str && str->next) {
-			last = str;
-			str = str->next;
-		}
-
-		str  = UI_Alloc(sizeof(stringDef_t));
-		str->next = NULL;
-		str->str = &strPool[ph];
-		if (last) {
-			last->next = str;
-		} else {
-			strHandle[hash] = str;
-		}
-		return &strPool[ph];
-	}
-	return NULL;
+  int len;
+  long hash;
+  stringDef_t *str, *last;
+  static const char *staticNULL = "";
+
+  if (p == NULL) {
+    return NULL;
+  }
+
+  if (*p == 0) {
+    return staticNULL;
+  }
+
+  hash = hashForString(p);
+
+  str = strHandle[hash];
+  while (str) {
+    if (strcmp(p, str->str) == 0) {
+      return str->str;
+    }
+    str = str->next;
+  }
+
+  len = strlen(p);
+  if (len + strPoolIndex + 1 < STRING_POOL_SIZE) {
+    int ph = strPoolIndex;
+    strcpy(&strPool[strPoolIndex], p);
+    strPoolIndex += len + 1;
+
+    str = strHandle[hash];
+    last = str;
+    while (str && str->next) {
+      last = str;
+      str = str->next;
+    }
+
+    str  = UI_Alloc(sizeof(stringDef_t));
+    str->next = NULL;
+    str->str = &strPool[ph];
+    if (last) {
+      last->next = str;
+    } else {
+      strHandle[hash] = str;
+    }
+    return &strPool[ph];
+  }
+  return NULL;
 }
 
 void String_Report() {
-	float f;
-	Com_Printf("Memory/String Pool Info\n");
-	Com_Printf("----------------\n");
-	f = strPoolIndex;
-	f /= STRING_POOL_SIZE;
-	f *= 100;
-	Com_Printf("String Pool is %.1f%% full, %i bytes out of %i used.\n", f, strPoolIndex, STRING_POOL_SIZE);
-	f = allocPoint;
-	f /= MEM_POOL_SIZE;
-	f *= 100;
-	Com_Printf("Memory Pool is %.1f%% full, %i bytes out of %i used.\n", f, allocPoint, MEM_POOL_SIZE);
+  float f;
+  Com_Printf("Memory/String Pool Info\n");
+  Com_Printf("----------------\n");
+  f = strPoolIndex;
+  f /= STRING_POOL_SIZE;
+  f *= 100;
+  Com_Printf("String Pool is %.1f%% full, %i bytes out of %i used.\n", f, strPoolIndex, STRING_POOL_SIZE);
+  f = allocPoint;
+  f /= MEM_POOL_SIZE;
+  f *= 100;
+  Com_Printf("Memory Pool is %.1f%% full, %i bytes out of %i used.\n", f, allocPoint, MEM_POOL_SIZE);
 }
 
 /*
@@ -226,20 +226,20 @@ String_Init
 =================
 */
 void String_Init() {
-	int i;
-	for (i = 0; i < HASH_TABLE_SIZE; i++) {
-		strHandle[i] = 0;
-	}
-	strHandleCount = 0;
-	strPoolIndex = 0;
-	menuCount = 0;
-	openMenuCount = 0;
-	UI_InitMemory();
-	Item_SetupKeywordHash();
-	Menu_SetupKeywordHash();
-	if (DC && DC->getBindingBuf) {
-		Controls_GetConfig();
-	}
+  int i;
+  for (i = 0; i < HASH_TABLE_SIZE; i++) {
+    strHandle[i] = 0;
+  }
+  strHandleCount = 0;
+  strPoolIndex = 0;
+  menuCount = 0;
+  openMenuCount = 0;
+  UI_InitMemory();
+  Item_SetupKeywordHash();
+  Menu_SetupKeywordHash();
+  if (DC && DC->getBindingBuf) {
+    Controls_GetConfig();
+  }
 }
 
 /*
@@ -248,20 +248,20 @@ PC_SourceWarning
 =================
 */
 void PC_SourceWarning(int handle, char *format, ...) {
-	int line;
-	char filename[128];
-	va_list argptr;
-	static char string[4096];
+  int line;
+  char filename[128];
+  va_list argptr;
+  static char string[4096];
 
-	va_start (argptr, format);
-	vsprintf (string, format, argptr);
-	va_end (argptr);
+  va_start (argptr, format);
+  vsprintf (string, format, argptr);
+  va_end (argptr);
 
-	filename[0] = '\0';
-	line = 0;
-	trap_PC_SourceFileAndLine(handle, filename, &line);
+  filename[0] = '\0';
+  line = 0;
+  trap_PC_SourceFileAndLine(handle, filename, &line);
 
-	Com_Printf(S_COLOR_YELLOW "WARNING: %s, line %d: %s\n", filename, line, string);
+  Com_Printf(S_COLOR_YELLOW "WARNING: %s, line %d: %s\n", filename, line, string);
 }
 
 /*
@@ -270,20 +270,20 @@ PC_SourceError
 =================
 */
 void PC_SourceError(int handle, char *format, ...) {
-	int line;
-	char filename[128];
-	va_list argptr;
-	static char string[4096];
+  int line;
+  char filename[128];
+  va_list argptr;
+  static char string[4096];
 
-	va_start (argptr, format);
-	vsprintf (string, format, argptr);
-	va_end (argptr);
+  va_start (argptr, format);
+  vsprintf (string, format, argptr);
+  va_end (argptr);
 
-	filename[0] = '\0';
-	line = 0;
-	trap_PC_SourceFileAndLine(handle, filename, &line);
+  filename[0] = '\0';
+  line = 0;
+  trap_PC_SourceFileAndLine(handle, filename, &line);
 
-	Com_Printf(S_COLOR_RED "ERROR: %s, line %d: %s\n", filename, line, string);
+  Com_Printf(S_COLOR_RED "ERROR: %s, line %d: %s\n", filename, line, string);
 }
 
 /*
@@ -293,17 +293,17 @@ LerpColor
 */
 void LerpColor(vec4_t a, vec4_t b, vec4_t c, float t)
 {
-	int i;
+  int i;
 
-	// lerp and clamp each component
-	for (i=0; i<4; i++)
-	{
-		c[i] = a[i] + t*(b[i]-a[i]);
-		if (c[i] < 0)
-			c[i] = 0;
-		else if (c[i] > 1.0)
-			c[i] = 1.0;
-	}
+  // lerp and clamp each component
+  for (i=0; i<4; i++)
+  {
+    c[i] = a[i] + t*(b[i]-a[i]);
+    if (c[i] < 0)
+      c[i] = 0;
+    else if (c[i] > 1.0)
+      c[i] = 1.0;
+  }
 }
 
 /*
@@ -312,14 +312,14 @@ Float_Parse
 =================
 */
 qboolean Float_Parse(char **p, float *f) {
-	char	*token;
-	token = COM_ParseExt(p, qfalse);
-	if (token && token[0] != 0) {
-		*f = atof(token);
-		return qtrue;
-	} else {
-		return qfalse;
-	}
+  char  *token;
+  token = COM_ParseExt(p, qfalse);
+  if (token && token[0] != 0) {
+    *f = atof(token);
+    return qtrue;
+  } else {
+    return qfalse;
+  }
 }
 
 /*
@@ -328,25 +328,25 @@ PC_Float_Parse
 =================
 */
 qboolean PC_Float_Parse(int handle, float *f) {
-	pc_token_t token;
-	int negative = qfalse;
-
-	if (!trap_PC_ReadToken(handle, &token))
-		return qfalse;
-	if (token.string[0] == '-') {
-		if (!trap_PC_ReadToken(handle, &token))
-			return qfalse;
-		negative = qtrue;
-	}
-	if (token.type != TT_NUMBER) {
-		PC_SourceError(handle, "expected float but found %s\n", token.string);
-		return qfalse;
-	}
-	if (negative)
-		*f = -token.floatvalue;
-	else
-		*f = token.floatvalue;
-	return qtrue;
+  pc_token_t token;
+  int negative = qfalse;
+
+  if (!trap_PC_ReadToken(handle, &token))
+    return qfalse;
+  if (token.string[0] == '-') {
+    if (!trap_PC_ReadToken(handle, &token))
+      return qfalse;
+    negative = qtrue;
+  }
+  if (token.type != TT_NUMBER) {
+    PC_SourceError(handle, "expected float but found %s\n", token.string);
+    return qfalse;
+  }
+  if (negative)
+    *f = -token.floatvalue;
+  else
+    *f = token.floatvalue;
+  return qtrue;
 }
 
 /*
@@ -355,16 +355,16 @@ Color_Parse
 =================
 */
 qboolean Color_Parse(char **p, vec4_t *c) {
-	int i;
-	float f;
+  int i;
+  float f;
 
-	for (i = 0; i < 4; i++) {
-		if (!Float_Parse(p, &f)) {
-			return qfalse;
-		}
-		(*c)[i] = f;
-	}
-	return qtrue;
+  for (i = 0; i < 4; i++) {
+    if (!Float_Parse(p, &f)) {
+      return qfalse;
+    }
+    (*c)[i] = f;
+  }
+  return qtrue;
 }
 
 /*
@@ -373,16 +373,16 @@ PC_Color_Parse
 =================
 */
 qboolean PC_Color_Parse(int handle, vec4_t *c) {
-	int i;
-	float f;
+  int i;
+  float f;
 
-	for (i = 0; i < 4; i++) {
-		if (!PC_Float_Parse(handle, &f)) {
-			return qfalse;
-		}
-		(*c)[i] = f;
-	}
-	return qtrue;
+  for (i = 0; i < 4; i++) {
+    if (!PC_Float_Parse(handle, &f)) {
+      return qfalse;
+    }
+    (*c)[i] = f;
+  }
+  return qtrue;
 }
 
 /*
@@ -391,15 +391,15 @@ Int_Parse
 =================
 */
 qboolean Int_Parse(char **p, int *i) {
-	char	*token;
-	token = COM_ParseExt(p, qfalse);
+  char  *token;
+  token = COM_ParseExt(p, qfalse);
 
-	if (token && token[0] != 0) {
-		*i = atoi(token);
-		return qtrue;
-	} else {
-		return qfalse;
-	}
+  if (token && token[0] != 0) {
+    *i = atoi(token);
+    return qtrue;
+  } else {
+    return qfalse;
+  }
 }
 
 /*
@@ -408,24 +408,24 @@ PC_Int_Parse
 =================
 */
 qboolean PC_Int_Parse(int handle, int *i) {
-	pc_token_t token;
-	int negative = qfalse;
-
-	if (!trap_PC_ReadToken(handle, &token))
-		return qfalse;
-	if (token.string[0] == '-') {
-		if (!trap_PC_ReadToken(handle, &token))
-			return qfalse;
-		negative = qtrue;
-	}
-	if (token.type != TT_NUMBER) {
-		PC_SourceError(handle, "expected integer but found %s\n", token.string);
-		return qfalse;
-	}
-	*i = token.intvalue;
-	if (negative)
-		*i = - *i;
-	return qtrue;
+  pc_token_t token;
+  int negative = qfalse;
+
+  if (!trap_PC_ReadToken(handle, &token))
+    return qfalse;
+  if (token.string[0] == '-') {
+    if (!trap_PC_ReadToken(handle, &token))
+      return qfalse;
+    negative = qtrue;
+  }
+  if (token.type != TT_NUMBER) {
+    PC_SourceError(handle, "expected integer but found %s\n", token.string);
+    return qfalse;
+  }
+  *i = token.intvalue;
+  if (negative)
+    *i = - *i;
+  return qtrue;
 }
 
 /*
@@ -434,16 +434,16 @@ Rect_Parse
 =================
 */
 qboolean Rect_Parse(char **p, rectDef_t *r) {
-	if (Float_Parse(p, &r->x)) {
-		if (Float_Parse(p, &r->y)) {
-			if (Float_Parse(p, &r->w)) {
-				if (Float_Parse(p, &r->h)) {
-					return qtrue;
-				}
-			}
-		}
-	}
-	return qfalse;
+  if (Float_Parse(p, &r->x)) {
+    if (Float_Parse(p, &r->y)) {
+      if (Float_Parse(p, &r->w)) {
+        if (Float_Parse(p, &r->h)) {
+          return qtrue;
+        }
+      }
+    }
+  }
+  return qfalse;
 }
 
 /*
@@ -452,16 +452,16 @@ PC_Rect_Parse
 =================
 */
 qboolean PC_Rect_Parse(int handle, rectDef_t *r) {
-	if (PC_Float_Parse(handle, &r->x)) {
-		if (PC_Float_Parse(handle, &r->y)) {
-			if (PC_Float_Parse(handle, &r->w)) {
-				if (PC_Float_Parse(handle, &r->h)) {
-					return qtrue;
-				}
-			}
-		}
-	}
-	return qfalse;
+  if (PC_Float_Parse(handle, &r->x)) {
+    if (PC_Float_Parse(handle, &r->y)) {
+      if (PC_Float_Parse(handle, &r->w)) {
+        if (PC_Float_Parse(handle, &r->h)) {
+          return qtrue;
+        }
+      }
+    }
+  }
+  return qfalse;
 }
 
 /*
@@ -470,14 +470,14 @@ String_Parse
 =================
 */
 qboolean String_Parse(char **p, const char **out) {
-	char *token;
+  char *token;
 
-	token = COM_ParseExt(p, qfalse);
-	if (token && token[0] != 0) {
-		*(out) = String_Alloc(token);
-		return qtrue;
-	}
-	return qfalse;
+  token = COM_ParseExt(p, qfalse);
+  if (token && token[0] != 0) {
+    *(out) = String_Alloc(token);
+    return qtrue;
+  }
+  return qfalse;
 }
 
 /*
@@ -486,12 +486,12 @@ PC_String_Parse
 =================
 */
 qboolean PC_String_Parse(int handle, const char **out) {
-	pc_token_t token;
+  pc_token_t token;
 
-	if (!trap_PC_ReadToken(handle, &token))
-		return qfalse;
-	
-	*(out) = String_Alloc(token.string);
+  if (!trap_PC_ReadToken(handle, &token))
+    return qfalse;
+  
+  *(out) = String_Alloc(token.string);
     return qtrue;
 }
 
@@ -501,36 +501,36 @@ PC_Script_Parse
 =================
 */
 qboolean PC_Script_Parse(int handle, const char **out) {
-	char script[1024];
-	pc_token_t token;
+  char script[1024];
+  pc_token_t token;
 
-	memset(script, 0, sizeof(script));
-	// scripts start with { and have ; separated command lists.. commands are command, arg.. 
-	// basically we want everything between the { } as it will be interpreted at run time
+  memset(script, 0, sizeof(script));
+  // scripts start with { and have ; separated command lists.. commands are command, arg.. 
+  // basically we want everything between the { } as it will be interpreted at run time
   
-	if (!trap_PC_ReadToken(handle, &token))
-		return qfalse;
-	if (Q_stricmp(token.string, "{") != 0) {
-	    return qfalse;
-	}
-
-	while ( 1 ) {
-		if (!trap_PC_ReadToken(handle, &token))
-			return qfalse;
-
-		if (Q_stricmp(token.string, "}") == 0) {
-			*out = String_Alloc(script);
-			return qtrue;
-		}
-
-		if (token.string[1] != '\0') {
-			Q_strcat(script, 1024, va("\"%s\"", token.string));
-		} else {
-			Q_strcat(script, 1024, token.string);
-		}
-		Q_strcat(script, 1024, " ");
-	}
-	return qfalse; 	// bk001105 - LCC   missing return value
+  if (!trap_PC_ReadToken(handle, &token))
+    return qfalse;
+  if (Q_stricmp(token.string, "{") != 0) {
+      return qfalse;
+  }
+
+  while ( 1 ) {
+    if (!trap_PC_ReadToken(handle, &token))
+      return qfalse;
+
+    if (Q_stricmp(token.string, "}") == 0) {
+      *out = String_Alloc(script);
+      return qtrue;
+    }
+
+    if (token.string[1] != '\0') {
+      Q_strcat(script, 1024, va("\"%s\"", token.string));
+    } else {
+      Q_strcat(script, 1024, token.string);
+    }
+    Q_strcat(script, 1024, " ");
+  }
+  return qfalse;  // bk001105 - LCC   missing return value
 }
 
 // display, window, menu, item code
@@ -544,7 +544,7 @@ Initializes the display with a structure to all the drawing routines
  ==================
 */
 void Init_Display(displayContextDef_t *dc) {
-	DC = dc;
+  DC = dc;
 }
 
 
@@ -552,10 +552,10 @@ void Init_Display(displayContextDef_t *dc) {
 // type and style painting 
 
 void GradientBar_Paint(rectDef_t *rect, vec4_t color) {
-	// gradient bar takes two paints
-	DC->setColor( color );
-	DC->drawHandlePic(rect->x, rect->y, rect->w, rect->h, DC->Assets.gradientBar);
-	DC->setColor( NULL );
+  // gradient bar takes two paints
+  DC->setColor( color );
+  DC->drawHandlePic(rect->x, rect->y, rect->w, rect->h, DC->Assets.gradientBar);
+  DC->setColor( NULL );
 }
 
 
@@ -568,10 +568,10 @@ Initializes a window structure ( windowDef_t ) with defaults
 ==================
 */
 void Window_Init(Window *w) {
-	memset(w, 0, sizeof(windowDef_t));
-	w->borderSize = 1;
-	w->foreColor[0] = w->foreColor[1] = w->foreColor[2] = w->foreColor[3] = 1.0;
-	w->cinematic = -1;
+  memset(w, 0, sizeof(windowDef_t));
+  w->borderSize = 1;
+  w->foreColor[0] = w->foreColor[1] = w->foreColor[2] = w->foreColor[3] = 1.0;
+  w->cinematic = -1;
 }
 
 void Fade(int *flags, float *f, float clamp, int *nextTime, int offsetTime, qboolean bFlags, float fadeAmount) {
@@ -622,14 +622,14 @@ void Window_Paint(Window *w, float fadeAmount, float fadeClamp, float fadeCycle)
 
   if (w->style == WINDOW_STYLE_FILLED) {
     // box, but possible a shader that needs filled
-		if (w->background) {
-		  Fade(&w->flags, &w->backColor[3], fadeClamp, &w->nextTime, fadeCycle, qtrue, fadeAmount);
+    if (w->background) {
+      Fade(&w->flags, &w->backColor[3], fadeClamp, &w->nextTime, fadeCycle, qtrue, fadeAmount);
       DC->setColor(w->backColor);
-	    DC->drawHandlePic(fillRect.x, fillRect.y, fillRect.w, fillRect.h, w->background);
-		  DC->setColor(NULL);
-		} else {
-	    DC->fillRect(fillRect.x, fillRect.y, fillRect.w, fillRect.h, w->backColor);
-		}
+      DC->drawHandlePic(fillRect.x, fillRect.y, fillRect.w, fillRect.h, w->background);
+      DC->setColor(NULL);
+    } else {
+      DC->fillRect(fillRect.x, fillRect.y, fillRect.w, fillRect.h, w->backColor);
+    }
   } else if (w->style == WINDOW_STYLE_GRADIENT) {
     GradientBar_Paint(&fillRect, w->backColor);
     // gradient bar
@@ -645,16 +645,16 @@ void Window_Paint(Window *w, float fadeAmount, float fadeClamp, float fadeCycle)
       DC->fillRect(fillRect.x, fillRect.y, fillRect.w, fillRect.h, color);
     }
   } else if (w->style == WINDOW_STYLE_CINEMATIC) {
-		if (w->cinematic == -1) {
-			w->cinematic = DC->playCinematic(w->cinematicName, fillRect.x, fillRect.y, fillRect.w, fillRect.h);
-			if (w->cinematic == -1) {
-				w->cinematic = -2;
-			}
-		} 
-		if (w->cinematic >= 0) {
-	    DC->runCinematicFrame(w->cinematic);
-			DC->drawCinematic(w->cinematic, fillRect.x, fillRect.y, fillRect.w, fillRect.h);
-		}
+    if (w->cinematic == -1) {
+      w->cinematic = DC->playCinematic(w->cinematicName, fillRect.x, fillRect.y, fillRect.w, fillRect.h);
+      if (w->cinematic == -1) {
+        w->cinematic = -2;
+      }
+    } 
+    if (w->cinematic >= 0) {
+      DC->runCinematicFrame(w->cinematic);
+      DC->drawCinematic(w->cinematic, fillRect.x, fillRect.y, fillRect.w, fillRect.h);
+    }
   }
 
   if (w->border == WINDOW_BORDER_FULL) {
@@ -679,12 +679,12 @@ void Window_Paint(Window *w, float fadeAmount, float fadeClamp, float fadeCycle)
     // top/bottom
     DC->setColor(w->borderColor);
     DC->drawTopBottom(w->rect.x, w->rect.y, w->rect.w, w->rect.h, w->borderSize);
-  	DC->setColor( NULL );
+    DC->setColor( NULL );
   } else if (w->border == WINDOW_BORDER_VERT) {
     // left right
     DC->setColor(w->borderColor);
     DC->drawSides(w->rect.x, w->rect.y, w->rect.w, w->rect.h, w->borderSize);
-  	DC->setColor( NULL );
+    DC->setColor( NULL );
   } else if (w->border == WINDOW_BORDER_KCGRADIENT) {
     // this is just two gradient bars along each horz edge
     rectDef_t r = w->rect;
@@ -763,16 +763,16 @@ void Menu_UpdatePosition(menuDef_t *menu) {
 }
 
 void Menu_PostParse(menuDef_t *menu) {
-	if (menu == NULL) {
-		return;
-	}
-	if (menu->fullScreen) {
-		menu->window.rect.x = 0;
-		menu->window.rect.y = 0;
-		menu->window.rect.w = 640;
-		menu->window.rect.h = 480;
-	}
-	Menu_UpdatePosition(menu);
+  if (menu == NULL) {
+    return;
+  }
+  if (menu->fullScreen) {
+    menu->window.rect.x = 0;
+    menu->window.rect.y = 0;
+    menu->window.rect.w = 640;
+    menu->window.rect.h = 480;
+  }
+  Menu_UpdatePosition(menu);
 }
 
 itemDef_t *Menu_ClearFocus(menuDef_t *menu) {
@@ -953,24 +953,24 @@ void Script_SetItemColor(itemDef_t *item, char **args) {
 
 
 void Menu_ShowItemByName(menuDef_t *menu, const char *p, qboolean bShow) {
-	itemDef_t *item;
-	int i;
-	int count = Menu_ItemsMatchingGroup(menu, p);
-	for (i = 0; i < count; i++) {
-		item = Menu_GetMatchingItemByNumber(menu, i, p);
-		if (item != NULL) {
-			if (bShow) {
-				item->window.flags |= WINDOW_VISIBLE;
-			} else {
-				item->window.flags &= ~WINDOW_VISIBLE;
-				// stop cinematics playing in the window
-				if (item->window.cinematic >= 0) {
-					DC->stopCinematic(item->window.cinematic);
-					item->window.cinematic = -1;
-				}
-			}
-		}
-	}
+  itemDef_t *item;
+  int i;
+  int count = Menu_ItemsMatchingGroup(menu, p);
+  for (i = 0; i < count; i++) {
+    item = Menu_GetMatchingItemByNumber(menu, i, p);
+    if (item != NULL) {
+      if (bShow) {
+        item->window.flags |= WINDOW_VISIBLE;
+      } else {
+        item->window.flags &= ~WINDOW_VISIBLE;
+        // stop cinematics playing in the window
+        if (item->window.cinematic >= 0) {
+          DC->stopCinematic(item->window.cinematic);
+          item->window.cinematic = -1;
+        }
+      }
+    }
+  }
 }
 
 void Menu_FadeItemByName(menuDef_t *menu, const char *p, qboolean fadeOut) {
@@ -1002,10 +1002,10 @@ menuDef_t *Menus_FindByName(const char *p) {
 }
 
 void Menus_ShowByName(const char *p) {
-	menuDef_t *menu = Menus_FindByName(p);
-	if (menu) {
-		Menus_Activate(menu);
-	}
+  menuDef_t *menu = Menus_FindByName(p);
+  if (menu) {
+    Menus_Activate(menu);
+  }
 }
 
 void Menus_OpenByName(const char *p) {
@@ -1013,26 +1013,26 @@ void Menus_OpenByName(const char *p) {
 }
 
 static void Menu_RunCloseScript(menuDef_t *menu) {
-	if (menu && menu->window.flags & WINDOW_VISIBLE && menu->onClose) {
-		itemDef_t item;
+  if (menu && menu->window.flags & WINDOW_VISIBLE && menu->onClose) {
+    itemDef_t item;
     item.parent = menu;
     Item_RunScript(&item, menu->onClose);
-	}
+  }
 }
 
 void Menus_CloseByName(const char *p) {
   menuDef_t *menu = Menus_FindByName(p);
   if (menu != NULL) {
-		Menu_RunCloseScript(menu);
-		menu->window.flags &= ~(WINDOW_VISIBLE | WINDOW_HASFOCUS);
+    Menu_RunCloseScript(menu);
+    menu->window.flags &= ~(WINDOW_VISIBLE | WINDOW_HASFOCUS);
   }
 }
 
 void Menus_CloseAll() {
   int i;
   for (i = 0; i < menuCount; i++) {
-		Menu_RunCloseScript(&Menus[i]);
-		Menus[i].window.flags &= ~(WINDOW_HASFOCUS | WINDOW_VISIBLE);
+    Menu_RunCloseScript(&Menus[i]);
+    Menus[i].window.flags &= ~(WINDOW_HASFOCUS | WINDOW_VISIBLE);
   }
 }
 
@@ -1090,12 +1090,12 @@ void Menu_TransitionItemByName(menuDef_t *menu, const char *p, rectDef_t rectFro
     if (item != NULL) {
       item->window.flags |= (WINDOW_INTRANSITION | WINDOW_VISIBLE);
       item->window.offsetTime = time;
-			memcpy(&item->window.rectClient, &rectFrom, sizeof(rectDef_t));
-			memcpy(&item->window.rectEffects, &rectTo, sizeof(rectDef_t));
-			item->window.rectEffects2.x = abs(rectTo.x - rectFrom.x) / amt;
-			item->window.rectEffects2.y = abs(rectTo.y - rectFrom.y) / amt;
-			item->window.rectEffects2.w = abs(rectTo.w - rectFrom.w) / amt;
-			item->window.rectEffects2.h = abs(rectTo.h - rectFrom.h) / amt;
+      memcpy(&item->window.rectClient, &rectFrom, sizeof(rectDef_t));
+      memcpy(&item->window.rectEffects, &rectTo, sizeof(rectDef_t));
+      item->window.rectEffects2.x = abs(rectTo.x - rectFrom.x) / amt;
+      item->window.rectEffects2.y = abs(rectTo.y - rectFrom.y) / amt;
+      item->window.rectEffects2.w = abs(rectTo.w - rectFrom.w) / amt;
+      item->window.rectEffects2.h = abs(rectTo.h - rectFrom.h) / amt;
       Item_UpdatePosition(item);
     }
   }
@@ -1104,9 +1104,9 @@ void Menu_TransitionItemByName(menuDef_t *menu, const char *p, rectDef_t rectFro
 
 void Script_Transition(itemDef_t *item, char **args) {
   const char *name;
-	rectDef_t rectFrom, rectTo;
+  rectDef_t rectFrom, rectTo;
   int time;
-	float amt;
+  float amt;
 
   if (String_Parse(args, &name)) {
     if ( Rect_Parse(args, &rectFrom) && Rect_Parse(args, &rectTo) && Int_Parse(args, &time) && Float_Parse(args, &amt)) {
@@ -1183,33 +1183,33 @@ void Script_SetPlayerHead(itemDef_t *item, char **args) {
 }
 
 void Script_SetCvar(itemDef_t *item, char **args) {
-	const char *cvar, *val;
-	if (String_Parse(args, &cvar) && String_Parse(args, &val)) {
-		DC->setCVar(cvar, val);
-	}
-	
+  const char *cvar, *val;
+  if (String_Parse(args, &cvar) && String_Parse(args, &val)) {
+    DC->setCVar(cvar, val);
+  }
+  
 }
 
 void Script_Exec(itemDef_t *item, char **args) {
-	const char *val;
-	if (String_Parse(args, &val)) {
-		DC->executeText(EXEC_APPEND, va("%s ; ", val));
-	}
+  const char *val;
+  if (String_Parse(args, &val)) {
+    DC->executeText(EXEC_APPEND, va("%s ; ", val));
+  }
 }
 
 void Script_Play(itemDef_t *item, char **args) {
-	const char *val;
-	if (String_Parse(args, &val)) {
-		DC->startLocalSound(DC->registerSound(val, qfalse), CHAN_LOCAL_SOUND);
-	}
+  const char *val;
+  if (String_Parse(args, &val)) {
+    DC->startLocalSound(DC->registerSound(val, qfalse), CHAN_LOCAL_SOUND);
+  }
 }
 
 void Script_playLooped(itemDef_t *item, char **args) {
-	const char *val;
-	if (String_Parse(args, &val)) {
-		DC->stopBackgroundTrack();
-		DC->startBackgroundTrack(val, val);
-	}
+  const char *val;
+  if (String_Parse(args, &val)) {
+    DC->stopBackgroundTrack();
+    DC->startBackgroundTrack(val, val);
+  }
 }
 
 
@@ -1280,8 +1280,8 @@ qboolean Item_EnableShowViaCvar(itemDef_t *item, int flag) {
   char script[1024], *p;
   memset(script, 0, sizeof(script));
   if (item && item->enableCvar && *item->enableCvar && item->cvarTest && *item->cvarTest) {
-		char buff[1024];
-	  DC->getCVarString(item->cvarTest, buff, sizeof(buff));
+    char buff[1024];
+    DC->getCVarString(item->cvarTest, buff, sizeof(buff));
 
     Q_strcat(script, 1024, item->enableCvar);
     p = script;
@@ -1289,373 +1289,373 @@ qboolean Item_EnableShowViaCvar(itemDef_t *item, int flag) {
       const char *val;
       // expect value then ; or NULL, NULL ends list
       if (!String_Parse(&p, &val)) {
-				return (item->cvarFlags & flag) ? qfalse : qtrue;
+        return (item->cvarFlags & flag) ? qfalse : qtrue;
       }
 
       if (val[0] == ';' && val[1] == '\0') {
         continue;
       }
 
-			// enable it if any of the values are true
-			if (item->cvarFlags & flag) {
+      // enable it if any of the values are true
+      if (item->cvarFlags & flag) {
         if (Q_stricmp(buff, val) == 0) {
-					return qtrue;
-				}
-			} else {
-				// disable it if any of the values are true
+          return qtrue;
+        }
+      } else {
+        // disable it if any of the values are true
         if (Q_stricmp(buff, val) == 0) {
-					return qfalse;
-				}
-			}
+          return qfalse;
+        }
+      }
 
     }
-		return (item->cvarFlags & flag) ? qfalse : qtrue;
+    return (item->cvarFlags & flag) ? qfalse : qtrue;
   }
-	return qtrue;
+  return qtrue;
 }
 
 
 // will optionaly set focus to this item 
 qboolean Item_SetFocus(itemDef_t *item, float x, float y) {
-	int i;
-	itemDef_t *oldFocus;
-	sfxHandle_t *sfx = &DC->Assets.itemFocusSound;
-	qboolean playSound = qfalse;
-	menuDef_t *parent; // bk001206: = (menuDef_t*)item->parent;
-	// sanity check, non-null, not a decoration and does not already have the focus
-	if (item == NULL || item->window.flags & WINDOW_DECORATION || item->window.flags & WINDOW_HASFOCUS || !(item->window.flags & WINDOW_VISIBLE)) {
-		return qfalse;
-	}
-
-	// bk001206 - this can be NULL.
-	parent = (menuDef_t*)item->parent; 
+  int i;
+  itemDef_t *oldFocus;
+  sfxHandle_t *sfx = &DC->Assets.itemFocusSound;
+  qboolean playSound = qfalse;
+  menuDef_t *parent; // bk001206: = (menuDef_t*)item->parent;
+  // sanity check, non-null, not a decoration and does not already have the focus
+  if (item == NULL || item->window.flags & WINDOW_DECORATION || item->window.flags & WINDOW_HASFOCUS || !(item->window.flags & WINDOW_VISIBLE)) {
+    return qfalse;
+  }
+
+  // bk001206 - this can be NULL.
+  parent = (menuDef_t*)item->parent; 
       
-	// items can be enabled and disabled based on cvars
-	if (item->cvarFlags & (CVAR_ENABLE | CVAR_DISABLE) && !Item_EnableShowViaCvar(item, CVAR_ENABLE)) {
-		return qfalse;
-	}
-
-	if (item->cvarFlags & (CVAR_SHOW | CVAR_HIDE) && !Item_EnableShowViaCvar(item, CVAR_SHOW)) {
-		return qfalse;
-	}
-
-	oldFocus = Menu_ClearFocus(item->parent);
-
-	if (item->type == ITEM_TYPE_TEXT) {
-		rectDef_t r;
-		r = item->textRect;
-		r.y -= r.h;
-		if (Rect_ContainsPoint(&r, x, y)) {
-			item->window.flags |= WINDOW_HASFOCUS;
-			if (item->focusSound) {
-				sfx = &item->focusSound;
-			}
-			playSound = qtrue;
-		} else {
-			if (oldFocus) {
-				oldFocus->window.flags |= WINDOW_HASFOCUS;
-				if (oldFocus->onFocus) {
-					Item_RunScript(oldFocus, oldFocus->onFocus);
-				}
-			}
-		}
-	} else {
-	    item->window.flags |= WINDOW_HASFOCUS;
-		if (item->onFocus) {
-			Item_RunScript(item, item->onFocus);
-		}
-		if (item->focusSound) {
-			sfx = &item->focusSound;
-		}
-		playSound = qtrue;
-	}
-
-	if (playSound && sfx) {
-		DC->startLocalSound( *sfx, CHAN_LOCAL_SOUND );
-	}
-
-	for (i = 0; i < parent->itemCount; i++) {
-		if (parent->items[i] == item) {
-			parent->cursorItem = i;
-			break;
-		}
-	}
-
-	return qtrue;
+  // items can be enabled and disabled based on cvars
+  if (item->cvarFlags & (CVAR_ENABLE | CVAR_DISABLE) && !Item_EnableShowViaCvar(item, CVAR_ENABLE)) {
+    return qfalse;
+  }
+
+  if (item->cvarFlags & (CVAR_SHOW | CVAR_HIDE) && !Item_EnableShowViaCvar(item, CVAR_SHOW)) {
+    return qfalse;
+  }
+
+  oldFocus = Menu_ClearFocus(item->parent);
+
+  if (item->type == ITEM_TYPE_TEXT) {
+    rectDef_t r;
+    r = item->textRect;
+    r.y -= r.h;
+    if (Rect_ContainsPoint(&r, x, y)) {
+      item->window.flags |= WINDOW_HASFOCUS;
+      if (item->focusSound) {
+        sfx = &item->focusSound;
+      }
+      playSound = qtrue;
+    } else {
+      if (oldFocus) {
+        oldFocus->window.flags |= WINDOW_HASFOCUS;
+        if (oldFocus->onFocus) {
+          Item_RunScript(oldFocus, oldFocus->onFocus);
+        }
+      }
+    }
+  } else {
+      item->window.flags |= WINDOW_HASFOCUS;
+    if (item->onFocus) {
+      Item_RunScript(item, item->onFocus);
+    }
+    if (item->focusSound) {
+      sfx = &item->focusSound;
+    }
+    playSound = qtrue;
+  }
+
+  if (playSound && sfx) {
+    DC->startLocalSound( *sfx, CHAN_LOCAL_SOUND );
+  }
+
+  for (i = 0; i < parent->itemCount; i++) {
+    if (parent->items[i] == item) {
+      parent->cursorItem = i;
+      break;
+    }
+  }
+
+  return qtrue;
 }
 
 int Item_ListBox_MaxScroll(itemDef_t *item) {
-	listBoxDef_t *listPtr = (listBoxDef_t*)item->typeData;
-	int count = DC->feederCount(item->special);
-	int max;
-
-	if (item->window.flags & WINDOW_HORIZONTAL) {
-		max = count - (item->window.rect.w / listPtr->elementWidth) + 1;
-	}
-	else {
-		max = count - (item->window.rect.h / listPtr->elementHeight) + 1;
-	}
-	if (max < 0) {
-		return 0;
-	}
-	return max;
+  listBoxDef_t *listPtr = (listBoxDef_t*)item->typeData;
+  int count = DC->feederCount(item->special);
+  int max;
+
+  if (item->window.flags & WINDOW_HORIZONTAL) {
+    max = count - (item->window.rect.w / listPtr->elementWidth) + 1;
+  }
+  else {
+    max = count - (item->window.rect.h / listPtr->elementHeight) + 1;
+  }
+  if (max < 0) {
+    return 0;
+  }
+  return max;
 }
 
 int Item_ListBox_ThumbPosition(itemDef_t *item) {
-	float max, pos, size;
-	listBoxDef_t *listPtr = (listBoxDef_t*)item->typeData;
-
-	max = Item_ListBox_MaxScroll(item);
-	if (item->window.flags & WINDOW_HORIZONTAL) {
-		size = item->window.rect.w - (SCROLLBAR_SIZE * 2) - 2;
-		if (max > 0) {
-			pos = (size-SCROLLBAR_SIZE) / (float) max;
-		} else {
-			pos = 0;
-		}
-		pos *= listPtr->startPos;
-		return item->window.rect.x + 1 + SCROLLBAR_SIZE + pos;
-	}
-	else {
-		size = item->window.rect.h - (SCROLLBAR_SIZE * 2) - 2;
-		if (max > 0) {
-			pos = (size-SCROLLBAR_SIZE) / (float) max;
-		} else {
-			pos = 0;
-		}
-		pos *= listPtr->startPos;
-		return item->window.rect.y + 1 + SCROLLBAR_SIZE + pos;
-	}
+  float max, pos, size;
+  listBoxDef_t *listPtr = (listBoxDef_t*)item->typeData;
+
+  max = Item_ListBox_MaxScroll(item);
+  if (item->window.flags & WINDOW_HORIZONTAL) {
+    size = item->window.rect.w - (SCROLLBAR_SIZE * 2) - 2;
+    if (max > 0) {
+      pos = (size-SCROLLBAR_SIZE) / (float) max;
+    } else {
+      pos = 0;
+    }
+    pos *= listPtr->startPos;
+    return item->window.rect.x + 1 + SCROLLBAR_SIZE + pos;
+  }
+  else {
+    size = item->window.rect.h - (SCROLLBAR_SIZE * 2) - 2;
+    if (max > 0) {
+      pos = (size-SCROLLBAR_SIZE) / (float) max;
+    } else {
+      pos = 0;
+    }
+    pos *= listPtr->startPos;
+    return item->window.rect.y + 1 + SCROLLBAR_SIZE + pos;
+  }
 }
 
 int Item_ListBox_ThumbDrawPosition(itemDef_t *item) {
-	int min, max;
-
-	if (itemCapture == item) {
-		if (item->window.flags & WINDOW_HORIZONTAL) {
-			min = item->window.rect.x + SCROLLBAR_SIZE + 1;
-			max = item->window.rect.x + item->window.rect.w - 2*SCROLLBAR_SIZE - 1;
-			if (DC->cursorx >= min + SCROLLBAR_SIZE/2 && DC->cursorx <= max + SCROLLBAR_SIZE/2) {
-				return DC->cursorx - SCROLLBAR_SIZE/2;
-			}
-			else {
-				return Item_ListBox_ThumbPosition(item);
-			}
-		}
-		else {
-			min = item->window.rect.y + SCROLLBAR_SIZE + 1;
-			max = item->window.rect.y + item->window.rect.h - 2*SCROLLBAR_SIZE - 1;
-			if (DC->cursory >= min + SCROLLBAR_SIZE/2 && DC->cursory <= max + SCROLLBAR_SIZE/2) {
-				return DC->cursory - SCROLLBAR_SIZE/2;
-			}
-			else {
-				return Item_ListBox_ThumbPosition(item);
-			}
-		}
-	}
-	else {
-		return Item_ListBox_ThumbPosition(item);
-	}
+  int min, max;
+
+  if (itemCapture == item) {
+    if (item->window.flags & WINDOW_HORIZONTAL) {
+      min = item->window.rect.x + SCROLLBAR_SIZE + 1;
+      max = item->window.rect.x + item->window.rect.w - 2*SCROLLBAR_SIZE - 1;
+      if (DC->cursorx >= min + SCROLLBAR_SIZE/2 && DC->cursorx <= max + SCROLLBAR_SIZE/2) {
+        return DC->cursorx - SCROLLBAR_SIZE/2;
+      }
+      else {
+        return Item_ListBox_ThumbPosition(item);
+      }
+    }
+    else {
+      min = item->window.rect.y + SCROLLBAR_SIZE + 1;
+      max = item->window.rect.y + item->window.rect.h - 2*SCROLLBAR_SIZE - 1;
+      if (DC->cursory >= min + SCROLLBAR_SIZE/2 && DC->cursory <= max + SCROLLBAR_SIZE/2) {
+        return DC->cursory - SCROLLBAR_SIZE/2;
+      }
+      else {
+        return Item_ListBox_ThumbPosition(item);
+      }
+    }
+  }
+  else {
+    return Item_ListBox_ThumbPosition(item);
+  }
 }
 
 float Item_Slider_ThumbPosition(itemDef_t *item) {
-	float value, range, x;
-	editFieldDef_t *editDef = item->typeData;
-
-	if (item->text) {
-		x = item->textRect.x + item->textRect.w + 8;
-	} else {
-		x = item->window.rect.x;
-	}
-
-	if (editDef == NULL && item->cvar) {
-		return x;
-	}
-
-	value = DC->getCVarValue(item->cvar);
-
-	if (value < editDef->minVal) {
-		value = editDef->minVal;
-	} else if (value > editDef->maxVal) {
-		value = editDef->maxVal;
-	}
-
-	range = editDef->maxVal - editDef->minVal;
-	value -= editDef->minVal;
-	value /= range;
-	//value /= (editDef->maxVal - editDef->minVal);
-	value *= SLIDER_WIDTH;
-	x += value;
-	// vm fuckage
-	//x = x + (((float)value / editDef->maxVal) * SLIDER_WIDTH);
-	return x;
+  float value, range, x;
+  editFieldDef_t *editDef = item->typeData;
+
+  if (item->text) {
+    x = item->textRect.x + item->textRect.w + 8;
+  } else {
+    x = item->window.rect.x;
+  }
+
+  if (editDef == NULL && item->cvar) {
+    return x;
+  }
+
+  value = DC->getCVarValue(item->cvar);
+
+  if (value < editDef->minVal) {
+    value = editDef->minVal;
+  } else if (value > editDef->maxVal) {
+    value = editDef->maxVal;
+  }
+
+  range = editDef->maxVal - editDef->minVal;
+  value -= editDef->minVal;
+  value /= range;
+  //value /= (editDef->maxVal - editDef->minVal);
+  value *= SLIDER_WIDTH;
+  x += value;
+  // vm fuckage
+  //x = x + (((float)value / editDef->maxVal) * SLIDER_WIDTH);
+  return x;
 }
 
 int Item_Slider_OverSlider(itemDef_t *item, float x, float y) {
-	rectDef_t r;
+  rectDef_t r;
 
-	r.x = Item_Slider_ThumbPosition(item) - (SLIDER_THUMB_WIDTH / 2);
-	r.y = item->window.rect.y - 2;
-	r.w = SLIDER_THUMB_WIDTH;
-	r.h = SLIDER_THUMB_HEIGHT;
+  r.x = Item_Slider_ThumbPosition(item) - (SLIDER_THUMB_WIDTH / 2);
+  r.y = item->window.rect.y - 2;
+  r.w = SLIDER_THUMB_WIDTH;
+  r.h = SLIDER_THUMB_HEIGHT;
 
-	if (Rect_ContainsPoint(&r, x, y)) {
-		return WINDOW_LB_THUMB;
-	}
-	return 0;
+  if (Rect_ContainsPoint(&r, x, y)) {
+    return WINDOW_LB_THUMB;
+  }
+  return 0;
 }
 
 int Item_ListBox_OverLB(itemDef_t *item, float x, float y) {
-	rectDef_t r;
-	listBoxDef_t *listPtr;
-	int thumbstart;
-	int count;
-
-	count = DC->feederCount(item->special);
-	listPtr = (listBoxDef_t*)item->typeData;
-	if (item->window.flags & WINDOW_HORIZONTAL) {
-		// check if on left arrow
-		r.x = item->window.rect.x;
-		r.y = item->window.rect.y + item->window.rect.h - SCROLLBAR_SIZE;
-		r.h = r.w = SCROLLBAR_SIZE;
-		if (Rect_ContainsPoint(&r, x, y)) {
-			return WINDOW_LB_LEFTARROW;
-		}
-		// check if on right arrow
-		r.x = item->window.rect.x + item->window.rect.w - SCROLLBAR_SIZE;
-		if (Rect_ContainsPoint(&r, x, y)) {
-			return WINDOW_LB_RIGHTARROW;
-		}
-		// check if on thumb
-		thumbstart = Item_ListBox_ThumbPosition(item);
-		r.x = thumbstart;
-		if (Rect_ContainsPoint(&r, x, y)) {
-			return WINDOW_LB_THUMB;
-		}
-		r.x = item->window.rect.x + SCROLLBAR_SIZE;
-		r.w = thumbstart - r.x;
-		if (Rect_ContainsPoint(&r, x, y)) {
-			return WINDOW_LB_PGUP;
-		}
-		r.x = thumbstart + SCROLLBAR_SIZE;
-		r.w = item->window.rect.x + item->window.rect.w - SCROLLBAR_SIZE;
-		if (Rect_ContainsPoint(&r, x, y)) {
-			return WINDOW_LB_PGDN;
-		}
-	} else {
-		r.x = item->window.rect.x + item->window.rect.w - SCROLLBAR_SIZE;
-		r.y = item->window.rect.y;
-		r.h = r.w = SCROLLBAR_SIZE;
-		if (Rect_ContainsPoint(&r, x, y)) {
-			return WINDOW_LB_LEFTARROW;
-		}
-		r.y = item->window.rect.y + item->window.rect.h - SCROLLBAR_SIZE;
-		if (Rect_ContainsPoint(&r, x, y)) {
-			return WINDOW_LB_RIGHTARROW;
-		}
-		thumbstart = Item_ListBox_ThumbPosition(item);
-		r.y = thumbstart;
-		if (Rect_ContainsPoint(&r, x, y)) {
-			return WINDOW_LB_THUMB;
-		}
-		r.y = item->window.rect.y + SCROLLBAR_SIZE;
-		r.h = thumbstart - r.y;
-		if (Rect_ContainsPoint(&r, x, y)) {
-			return WINDOW_LB_PGUP;
-		}
-		r.y = thumbstart + SCROLLBAR_SIZE;
-		r.h = item->window.rect.y + item->window.rect.h - SCROLLBAR_SIZE;
-		if (Rect_ContainsPoint(&r, x, y)) {
-			return WINDOW_LB_PGDN;
-		}
-	}
-	return 0;
+  rectDef_t r;
+  listBoxDef_t *listPtr;
+  int thumbstart;
+  int count;
+
+  count = DC->feederCount(item->special);
+  listPtr = (listBoxDef_t*)item->typeData;
+  if (item->window.flags & WINDOW_HORIZONTAL) {
+    // check if on left arrow
+    r.x = item->window.rect.x;
+    r.y = item->window.rect.y + item->window.rect.h - SCROLLBAR_SIZE;
+    r.h = r.w = SCROLLBAR_SIZE;
+    if (Rect_ContainsPoint(&r, x, y)) {
+      return WINDOW_LB_LEFTARROW;
+    }
+    // check if on right arrow
+    r.x = item->window.rect.x + item->window.rect.w - SCROLLBAR_SIZE;
+    if (Rect_ContainsPoint(&r, x, y)) {
+      return WINDOW_LB_RIGHTARROW;
+    }
+    // check if on thumb
+    thumbstart = Item_ListBox_ThumbPosition(item);
+    r.x = thumbstart;
+    if (Rect_ContainsPoint(&r, x, y)) {
+      return WINDOW_LB_THUMB;
+    }
+    r.x = item->window.rect.x + SCROLLBAR_SIZE;
+    r.w = thumbstart - r.x;
+    if (Rect_ContainsPoint(&r, x, y)) {
+      return WINDOW_LB_PGUP;
+    }
+    r.x = thumbstart + SCROLLBAR_SIZE;
+    r.w = item->window.rect.x + item->window.rect.w - SCROLLBAR_SIZE;
+    if (Rect_ContainsPoint(&r, x, y)) {
+      return WINDOW_LB_PGDN;
+    }
+  } else {
+    r.x = item->window.rect.x + item->window.rect.w - SCROLLBAR_SIZE;
+    r.y = item->window.rect.y;
+    r.h = r.w = SCROLLBAR_SIZE;
+    if (Rect_ContainsPoint(&r, x, y)) {
+      return WINDOW_LB_LEFTARROW;
+    }
+    r.y = item->window.rect.y + item->window.rect.h - SCROLLBAR_SIZE;
+    if (Rect_ContainsPoint(&r, x, y)) {
+      return WINDOW_LB_RIGHTARROW;
+    }
+    thumbstart = Item_ListBox_ThumbPosition(item);
+    r.y = thumbstart;
+    if (Rect_ContainsPoint(&r, x, y)) {
+      return WINDOW_LB_THUMB;
+    }
+    r.y = item->window.rect.y + SCROLLBAR_SIZE;
+    r.h = thumbstart - r.y;
+    if (Rect_ContainsPoint(&r, x, y)) {
+      return WINDOW_LB_PGUP;
+    }
+    r.y = thumbstart + SCROLLBAR_SIZE;
+    r.h = item->window.rect.y + item->window.rect.h - SCROLLBAR_SIZE;
+    if (Rect_ContainsPoint(&r, x, y)) {
+      return WINDOW_LB_PGDN;
+    }
+  }
+  return 0;
 }
 
 
 void Item_ListBox_MouseEnter(itemDef_t *item, float x, float y) 
 {
-	rectDef_t r;
-	listBoxDef_t *listPtr = (listBoxDef_t*)item->typeData;
+  rectDef_t r;
+  listBoxDef_t *listPtr = (listBoxDef_t*)item->typeData;
         
-	item->window.flags &= ~(WINDOW_LB_LEFTARROW | WINDOW_LB_RIGHTARROW | WINDOW_LB_THUMB | WINDOW_LB_PGUP | WINDOW_LB_PGDN);
-	item->window.flags |= Item_ListBox_OverLB(item, x, y);
-
-	if (item->window.flags & WINDOW_HORIZONTAL) {
-		if (!(item->window.flags & (WINDOW_LB_LEFTARROW | WINDOW_LB_RIGHTARROW | WINDOW_LB_THUMB | WINDOW_LB_PGUP | WINDOW_LB_PGDN))) {
-			// check for selection hit as we have exausted buttons and thumb
-			if (listPtr->elementStyle == LISTBOX_IMAGE) {
-				r.x = item->window.rect.x;
-				r.y = item->window.rect.y;
-				r.h = item->window.rect.h - SCROLLBAR_SIZE;
-				r.w = item->window.rect.w - listPtr->drawPadding;
-				if (Rect_ContainsPoint(&r, x, y)) {
-					listPtr->cursorPos =  (int)((x - r.x) / listPtr->elementWidth)  + listPtr->startPos;
-					if (listPtr->cursorPos >= listPtr->endPos) {
-						listPtr->cursorPos = listPtr->endPos;
-					}
-				}
-			} else {
-				// text hit.. 
-			}
-		}
-	} else if (!(item->window.flags & (WINDOW_LB_LEFTARROW | WINDOW_LB_RIGHTARROW | WINDOW_LB_THUMB | WINDOW_LB_PGUP | WINDOW_LB_PGDN))) {
-		r.x = item->window.rect.x;
-		r.y = item->window.rect.y;
-		r.w = item->window.rect.w - SCROLLBAR_SIZE;
-		r.h = item->window.rect.h - listPtr->drawPadding;
-		if (Rect_ContainsPoint(&r, x, y)) {
-			listPtr->cursorPos =  (int)((y - 2 - r.y) / listPtr->elementHeight)  + listPtr->startPos;
-			if (listPtr->cursorPos > listPtr->endPos) {
-				listPtr->cursorPos = listPtr->endPos;
-			}
-		}
-	}
+  item->window.flags &= ~(WINDOW_LB_LEFTARROW | WINDOW_LB_RIGHTARROW | WINDOW_LB_THUMB | WINDOW_LB_PGUP | WINDOW_LB_PGDN);
+  item->window.flags |= Item_ListBox_OverLB(item, x, y);
+
+  if (item->window.flags & WINDOW_HORIZONTAL) {
+    if (!(item->window.flags & (WINDOW_LB_LEFTARROW | WINDOW_LB_RIGHTARROW | WINDOW_LB_THUMB | WINDOW_LB_PGUP | WINDOW_LB_PGDN))) {
+      // check for selection hit as we have exausted buttons and thumb
+      if (listPtr->elementStyle == LISTBOX_IMAGE) {
+        r.x = item->window.rect.x;
+        r.y = item->window.rect.y;
+        r.h = item->window.rect.h - SCROLLBAR_SIZE;
+        r.w = item->window.rect.w - listPtr->drawPadding;
+        if (Rect_ContainsPoint(&r, x, y)) {
+          listPtr->cursorPos =  (int)((x - r.x) / listPtr->elementWidth)  + listPtr->startPos;
+          if (listPtr->cursorPos >= listPtr->endPos) {
+            listPtr->cursorPos = listPtr->endPos;
+          }
+        }
+      } else {
+        // text hit.. 
+      }
+    }
+  } else if (!(item->window.flags & (WINDOW_LB_LEFTARROW | WINDOW_LB_RIGHTARROW | WINDOW_LB_THUMB | WINDOW_LB_PGUP | WINDOW_LB_PGDN))) {
+    r.x = item->window.rect.x;
+    r.y = item->window.rect.y;
+    r.w = item->window.rect.w - SCROLLBAR_SIZE;
+    r.h = item->window.rect.h - listPtr->drawPadding;
+    if (Rect_ContainsPoint(&r, x, y)) {
+      listPtr->cursorPos =  (int)((y - 2 - r.y) / listPtr->elementHeight)  + listPtr->startPos;
+      if (listPtr->cursorPos > listPtr->endPos) {
+        listPtr->cursorPos = listPtr->endPos;
+      }
+    }
+  }
 }
 
 void Item_MouseEnter(itemDef_t *item, float x, float y) {
-	rectDef_t r;
-	if (item) {
-		r = item->textRect;
-		r.y -= r.h;
-		// in the text rect?
-
-		// items can be enabled and disabled based on cvars
-		if (item->cvarFlags & (CVAR_ENABLE | CVAR_DISABLE) && !Item_EnableShowViaCvar(item, CVAR_ENABLE)) {
-			return;
-		}
-
-		if (item->cvarFlags & (CVAR_SHOW | CVAR_HIDE) && !Item_EnableShowViaCvar(item, CVAR_SHOW)) {
-			return;
-		}
-
-		if (Rect_ContainsPoint(&r, x, y)) {
-			if (!(item->window.flags & WINDOW_MOUSEOVERTEXT)) {
-				Item_RunScript(item, item->mouseEnterText);
-				item->window.flags |= WINDOW_MOUSEOVERTEXT;
-			}
-			if (!(item->window.flags & WINDOW_MOUSEOVER)) {
-				Item_RunScript(item, item->mouseEnter);
-				item->window.flags |= WINDOW_MOUSEOVER;
-			}
-
-		} else {
-			// not in the text rect
-			if (item->window.flags & WINDOW_MOUSEOVERTEXT) {
-				// if we were
-				Item_RunScript(item, item->mouseExitText);
-				item->window.flags &= ~WINDOW_MOUSEOVERTEXT;
-			}
-			if (!(item->window.flags & WINDOW_MOUSEOVER)) {
-				Item_RunScript(item, item->mouseEnter);
-				item->window.flags |= WINDOW_MOUSEOVER;
-			}
-
-			if (item->type == ITEM_TYPE_LISTBOX) {
-				Item_ListBox_MouseEnter(item, x, y);
-			}
-		}
-	}
+  rectDef_t r;
+  if (item) {
+    r = item->textRect;
+    r.y -= r.h;
+    // in the text rect?
+
+    // items can be enabled and disabled based on cvars
+    if (item->cvarFlags & (CVAR_ENABLE | CVAR_DISABLE) && !Item_EnableShowViaCvar(item, CVAR_ENABLE)) {
+      return;
+    }
+
+    if (item->cvarFlags & (CVAR_SHOW | CVAR_HIDE) && !Item_EnableShowViaCvar(item, CVAR_SHOW)) {
+      return;
+    }
+
+    if (Rect_ContainsPoint(&r, x, y)) {
+      if (!(item->window.flags & WINDOW_MOUSEOVERTEXT)) {
+        Item_RunScript(item, item->mouseEnterText);
+        item->window.flags |= WINDOW_MOUSEOVERTEXT;
+      }
+      if (!(item->window.flags & WINDOW_MOUSEOVER)) {
+        Item_RunScript(item, item->mouseEnter);
+        item->window.flags |= WINDOW_MOUSEOVER;
+      }
+
+    } else {
+      // not in the text rect
+      if (item->window.flags & WINDOW_MOUSEOVERTEXT) {
+        // if we were
+        Item_RunScript(item, item->mouseExitText);
+        item->window.flags &= ~WINDOW_MOUSEOVERTEXT;
+      }
+      if (!(item->window.flags & WINDOW_MOUSEOVER)) {
+        Item_RunScript(item, item->mouseEnter);
+        item->window.flags |= WINDOW_MOUSEOVER;
+      }
+
+      if (item->type == ITEM_TYPE_LISTBOX) {
+        Item_ListBox_MouseEnter(item, x, y);
+      }
+    }
+  }
 }
 
 void Item_MouseLeave(itemDef_t *item) {
@@ -1698,219 +1698,219 @@ qboolean Item_OwnerDraw_HandleKey(itemDef_t *item, int key) {
 }
 
 qboolean Item_ListBox_HandleKey(itemDef_t *item, int key, qboolean down, qboolean force) {
-	listBoxDef_t *listPtr = (listBoxDef_t*)item->typeData;
-	int count = DC->feederCount(item->special);
-	int max, viewmax;
-
-	if (force || (Rect_ContainsPoint(&item->window.rect, DC->cursorx, DC->cursory) && item->window.flags & WINDOW_HASFOCUS)) {
-		max = Item_ListBox_MaxScroll(item);
-		if (item->window.flags & WINDOW_HORIZONTAL) {
-			viewmax = (item->window.rect.w / listPtr->elementWidth);
-			if ( key == K_LEFTARROW || key == K_KP_LEFTARROW ) 
-			{
-				if (!listPtr->notselectable) {
-					listPtr->cursorPos--;
-					if (listPtr->cursorPos < 0) {
-						listPtr->cursorPos = 0;
-					}
-					if (listPtr->cursorPos < listPtr->startPos) {
-						listPtr->startPos = listPtr->cursorPos;
-					}
-					if (listPtr->cursorPos >= listPtr->startPos + viewmax) {
-						listPtr->startPos = listPtr->cursorPos - viewmax + 1;
-					}
-					item->cursorPos = listPtr->cursorPos;
-					DC->feederSelection(item->special, item->cursorPos);
-				}
-				else {
-					listPtr->startPos--;
-					if (listPtr->startPos < 0)
-						listPtr->startPos = 0;
-				}
-				return qtrue;
-			}
-			if ( key == K_RIGHTARROW || key == K_KP_RIGHTARROW ) 
-			{
-				if (!listPtr->notselectable) {
-					listPtr->cursorPos++;
-					if (listPtr->cursorPos < listPtr->startPos) {
-						listPtr->startPos = listPtr->cursorPos;
-					}
-					if (listPtr->cursorPos >= count) {
-						listPtr->cursorPos = count-1;
-					}
-					if (listPtr->cursorPos >= listPtr->startPos + viewmax) {
-						listPtr->startPos = listPtr->cursorPos - viewmax + 1;
-					}
-					item->cursorPos = listPtr->cursorPos;
-					DC->feederSelection(item->special, item->cursorPos);
-				}
-				else {
-					listPtr->startPos++;
-					if (listPtr->startPos >= count)
-						listPtr->startPos = count-1;
-				}
-				return qtrue;
-			}
-		}
-		else {
-			viewmax = (item->window.rect.h / listPtr->elementHeight);
-			if ( key == K_UPARROW || key == K_KP_UPARROW ) 
-			{
-				if (!listPtr->notselectable) {
-					listPtr->cursorPos--;
-					if (listPtr->cursorPos < 0) {
-						listPtr->cursorPos = 0;
-					}
-					if (listPtr->cursorPos < listPtr->startPos) {
-						listPtr->startPos = listPtr->cursorPos;
-					}
-					if (listPtr->cursorPos >= listPtr->startPos + viewmax) {
-						listPtr->startPos = listPtr->cursorPos - viewmax + 1;
-					}
-					item->cursorPos = listPtr->cursorPos;
-					DC->feederSelection(item->special, item->cursorPos);
-				}
-				else {
-					listPtr->startPos--;
-					if (listPtr->startPos < 0)
-						listPtr->startPos = 0;
-				}
-				return qtrue;
-			}
-			if ( key == K_DOWNARROW || key == K_KP_DOWNARROW ) 
-			{
-				if (!listPtr->notselectable) {
-					listPtr->cursorPos++;
-					if (listPtr->cursorPos < listPtr->startPos) {
-						listPtr->startPos = listPtr->cursorPos;
-					}
-					if (listPtr->cursorPos >= count) {
-						listPtr->cursorPos = count-1;
-					}
-					if (listPtr->cursorPos >= listPtr->startPos + viewmax) {
-						listPtr->startPos = listPtr->cursorPos - viewmax + 1;
-					}
-					item->cursorPos = listPtr->cursorPos;
-					DC->feederSelection(item->special, item->cursorPos);
-				}
-				else {
-					listPtr->startPos++;
-					if (listPtr->startPos > max)
-						listPtr->startPos = max;
-				}
-				return qtrue;
-			}
-		}
-		// mouse hit
-		if (key == K_MOUSE1 || key == K_MOUSE2) {
-			if (item->window.flags & WINDOW_LB_LEFTARROW) {
-				listPtr->startPos--;
-				if (listPtr->startPos < 0) {
-					listPtr->startPos = 0;
-				}
-			} else if (item->window.flags & WINDOW_LB_RIGHTARROW) {
-				// one down
-				listPtr->startPos++;
-				if (listPtr->startPos > max) {
-					listPtr->startPos = max;
-				}
-			} else if (item->window.flags & WINDOW_LB_PGUP) {
-				// page up
-				listPtr->startPos -= viewmax;
-				if (listPtr->startPos < 0) {
-					listPtr->startPos = 0;
-				}
-			} else if (item->window.flags & WINDOW_LB_PGDN) {
-				// page down
-				listPtr->startPos += viewmax;
-				if (listPtr->startPos > max) {
-					listPtr->startPos = max;
-				}
-			} else if (item->window.flags & WINDOW_LB_THUMB) {
-				// Display_SetCaptureItem(item);
-			} else {
-				// select an item
-				if (DC->realTime < lastListBoxClickTime && listPtr->doubleClick) {
-					Item_RunScript(item, listPtr->doubleClick);
-				}
-				lastListBoxClickTime = DC->realTime + DOUBLE_CLICK_DELAY;
-				if (item->cursorPos != listPtr->cursorPos) {
-					item->cursorPos = listPtr->cursorPos;
-					DC->feederSelection(item->special, item->cursorPos);
-				}
-			}
-			return qtrue;
-		}
-		if ( key == K_HOME || key == K_KP_HOME) {
-			// home
-			listPtr->startPos = 0;
-			return qtrue;
-		}
-		if ( key == K_END || key == K_KP_END) {
-			// end
-			listPtr->startPos = max;
-			return qtrue;
-		}
-		if (key == K_PGUP || key == K_KP_PGUP ) {
-			// page up
-			if (!listPtr->notselectable) {
-				listPtr->cursorPos -= viewmax;
-				if (listPtr->cursorPos < 0) {
-					listPtr->cursorPos = 0;
-				}
-				if (listPtr->cursorPos < listPtr->startPos) {
-					listPtr->startPos = listPtr->cursorPos;
-				}
-				if (listPtr->cursorPos >= listPtr->startPos + viewmax) {
-					listPtr->startPos = listPtr->cursorPos - viewmax + 1;
-				}
-				item->cursorPos = listPtr->cursorPos;
-				DC->feederSelection(item->special, item->cursorPos);
-			}
-			else {
-				listPtr->startPos -= viewmax;
-				if (listPtr->startPos < 0) {
-					listPtr->startPos = 0;
-				}
-			}
-			return qtrue;
-		}
-		if ( key == K_PGDN || key == K_KP_PGDN ) {
-			// page down
-			if (!listPtr->notselectable) {
-				listPtr->cursorPos += viewmax;
-				if (listPtr->cursorPos < listPtr->startPos) {
-					listPtr->startPos = listPtr->cursorPos;
-				}
-				if (listPtr->cursorPos >= count) {
-					listPtr->cursorPos = count-1;
-				}
-				if (listPtr->cursorPos >= listPtr->startPos + viewmax) {
-					listPtr->startPos = listPtr->cursorPos - viewmax + 1;
-				}
-				item->cursorPos = listPtr->cursorPos;
-				DC->feederSelection(item->special, item->cursorPos);
-			}
-			else {
-				listPtr->startPos += viewmax;
-				if (listPtr->startPos > max) {
-					listPtr->startPos = max;
-				}
-			}
-			return qtrue;
-		}
-	}
-	return qfalse;
+  listBoxDef_t *listPtr = (listBoxDef_t*)item->typeData;
+  int count = DC->feederCount(item->special);
+  int max, viewmax;
+
+  if (force || (Rect_ContainsPoint(&item->window.rect, DC->cursorx, DC->cursory) && item->window.flags & WINDOW_HASFOCUS)) {
+    max = Item_ListBox_MaxScroll(item);
+    if (item->window.flags & WINDOW_HORIZONTAL) {
+      viewmax = (item->window.rect.w / listPtr->elementWidth);
+      if ( key == K_LEFTARROW || key == K_KP_LEFTARROW ) 
+      {
+        if (!listPtr->notselectable) {
+          listPtr->cursorPos--;
+          if (listPtr->cursorPos < 0) {
+            listPtr->cursorPos = 0;
+          }
+          if (listPtr->cursorPos < listPtr->startPos) {
+            listPtr->startPos = listPtr->cursorPos;
+          }
+          if (listPtr->cursorPos >= listPtr->startPos + viewmax) {
+            listPtr->startPos = listPtr->cursorPos - viewmax + 1;
+          }
+          item->cursorPos = listPtr->cursorPos;
+          DC->feederSelection(item->special, item->cursorPos);
+        }
+        else {
+          listPtr->startPos--;
+          if (listPtr->startPos < 0)
+            listPtr->startPos = 0;
+        }
+        return qtrue;
+      }
+      if ( key == K_RIGHTARROW || key == K_KP_RIGHTARROW ) 
+      {
+        if (!listPtr->notselectable) {
+          listPtr->cursorPos++;
+          if (listPtr->cursorPos < listPtr->startPos) {
+            listPtr->startPos = listPtr->cursorPos;
+          }
+          if (listPtr->cursorPos >= count) {
+            listPtr->cursorPos = count-1;
+          }
+          if (listPtr->cursorPos >= listPtr->startPos + viewmax) {
+            listPtr->startPos = listPtr->cursorPos - viewmax + 1;
+          }
+          item->cursorPos = listPtr->cursorPos;
+          DC->feederSelection(item->special, item->cursorPos);
+        }
+        else {
+          listPtr->startPos++;
+          if (listPtr->startPos >= count)
+            listPtr->startPos = count-1;
+        }
+        return qtrue;
+      }
+    }
+    else {
+      viewmax = (item->window.rect.h / listPtr->elementHeight);
+      if ( key == K_UPARROW || key == K_KP_UPARROW ) 
+      {
+        if (!listPtr->notselectable) {
+          listPtr->cursorPos--;
+          if (listPtr->cursorPos < 0) {
+            listPtr->cursorPos = 0;
+          }
+          if (listPtr->cursorPos < listPtr->startPos) {
+            listPtr->startPos = listPtr->cursorPos;
+          }
+          if (listPtr->cursorPos >= listPtr->startPos + viewmax) {
+            listPtr->startPos = listPtr->cursorPos - viewmax + 1;
+          }
+          item->cursorPos = listPtr->cursorPos;
+          DC->feederSelection(item->special, item->cursorPos);
+        }
+        else {
+          listPtr->startPos--;
+          if (listPtr->startPos < 0)
+            listPtr->startPos = 0;
+        }
+        return qtrue;
+      }
+      if ( key == K_DOWNARROW || key == K_KP_DOWNARROW ) 
+      {
+        if (!listPtr->notselectable) {
+          listPtr->cursorPos++;
+          if (listPtr->cursorPos < listPtr->startPos) {
+            listPtr->startPos = listPtr->cursorPos;
+          }
+          if (listPtr->cursorPos >= count) {
+            listPtr->cursorPos = count-1;
+          }
+          if (listPtr->cursorPos >= listPtr->startPos + viewmax) {
+            listPtr->startPos = listPtr->cursorPos - viewmax + 1;
+          }
+          item->cursorPos = listPtr->cursorPos;
+          DC->feederSelection(item->special, item->cursorPos);
+        }
+        else {
+          listPtr->startPos++;
+          if (listPtr->startPos > max)
+            listPtr->startPos = max;
+        }
+        return qtrue;
+      }
+    }
+    // mouse hit
+    if (key == K_MOUSE1 || key == K_MOUSE2) {
+      if (item->window.flags & WINDOW_LB_LEFTARROW) {
+        listPtr->startPos--;
+        if (listPtr->startPos < 0) {
+          listPtr->startPos = 0;
+        }
+      } else if (item->window.flags & WINDOW_LB_RIGHTARROW) {
+        // one down
+        listPtr->startPos++;
+        if (listPtr->startPos > max) {
+          listPtr->startPos = max;
+        }
+      } else if (item->window.flags & WINDOW_LB_PGUP) {
+        // page up
+        listPtr->startPos -= viewmax;
+        if (listPtr->startPos < 0) {
+          listPtr->startPos = 0;
+        }
+      } else if (item->window.flags & WINDOW_LB_PGDN) {
+        // page down
+        listPtr->startPos += viewmax;
+        if (listPtr->startPos > max) {
+          listPtr->startPos = max;
+        }
+      } else if (item->window.flags & WINDOW_LB_THUMB) {
+        // Display_SetCaptureItem(item);
+      } else {
+        // select an item
+        if (DC->realTime < lastListBoxClickTime && listPtr->doubleClick) {
+          Item_RunScript(item, listPtr->doubleClick);
+        }
+        lastListBoxClickTime = DC->realTime + DOUBLE_CLICK_DELAY;
+        if (item->cursorPos != listPtr->cursorPos) {
+          item->cursorPos = listPtr->cursorPos;
+          DC->feederSelection(item->special, item->cursorPos);
+        }
+      }
+      return qtrue;
+    }
+    if ( key == K_HOME || key == K_KP_HOME) {
+      // home
+      listPtr->startPos = 0;
+      return qtrue;
+    }
+    if ( key == K_END || key == K_KP_END) {
+      // end
+      listPtr->startPos = max;
+      return qtrue;
+    }
+    if (key == K_PGUP || key == K_KP_PGUP ) {
+      // page up
+      if (!listPtr->notselectable) {
+        listPtr->cursorPos -= viewmax;
+        if (listPtr->cursorPos < 0) {
+          listPtr->cursorPos = 0;
+        }
+        if (listPtr->cursorPos < listPtr->startPos) {
+          listPtr->startPos = listPtr->cursorPos;
+        }
+        if (listPtr->cursorPos >= listPtr->startPos + viewmax) {
+          listPtr->startPos = listPtr->cursorPos - viewmax + 1;
+        }
+        item->cursorPos = listPtr->cursorPos;
+        DC->feederSelection(item->special, item->cursorPos);
+      }
+      else {
+        listPtr->startPos -= viewmax;
+        if (listPtr->startPos < 0) {
+          listPtr->startPos = 0;
+        }
+      }
+      return qtrue;
+    }
+    if ( key == K_PGDN || key == K_KP_PGDN ) {
+      // page down
+      if (!listPtr->notselectable) {
+        listPtr->cursorPos += viewmax;
+        if (listPtr->cursorPos < listPtr->startPos) {
+          listPtr->startPos = listPtr->cursorPos;
+        }
+        if (listPtr->cursorPos >= count) {
+          listPtr->cursorPos = count-1;
+        }
+        if (listPtr->cursorPos >= listPtr->startPos + viewmax) {
+          listPtr->startPos = listPtr->cursorPos - viewmax + 1;
+        }
+        item->cursorPos = listPtr->cursorPos;
+        DC->feederSelection(item->special, item->cursorPos);
+      }
+      else {
+        listPtr->startPos += viewmax;
+        if (listPtr->startPos > max) {
+          listPtr->startPos = max;
+        }
+      }
+      return qtrue;
+    }
+  }
+  return qfalse;
 }
 
 qboolean Item_YesNo_HandleKey(itemDef_t *item, int key) {
 
   if (Rect_ContainsPoint(&item->window.rect, DC->cursorx, DC->cursory) && item->window.flags & WINDOW_HASFOCUS && item->cvar) {
-		if (key == K_MOUSE1 || key == K_ENTER || key == K_MOUSE2 || key == K_MOUSE3) {
-	    DC->setCVar(item->cvar, va("%i", !DC->getCVarValue(item->cvar)));
-		  return qtrue;
-		}
+    if (key == K_MOUSE1 || key == K_ENTER || key == K_MOUSE2 || key == K_MOUSE3) {
+      DC->setCVar(item->cvar, va("%i", !DC->getCVarValue(item->cvar)));
+      return qtrue;
+    }
   }
 
   return qfalse;
@@ -1918,386 +1918,386 @@ qboolean Item_YesNo_HandleKey(itemDef_t *item, int key) {
 }
 
 int Item_Multi_CountSettings(itemDef_t *item) {
-	multiDef_t *multiPtr = (multiDef_t*)item->typeData;
-	if (multiPtr == NULL) {
-		return 0;
-	}
-	return multiPtr->count;
+  multiDef_t *multiPtr = (multiDef_t*)item->typeData;
+  if (multiPtr == NULL) {
+    return 0;
+  }
+  return multiPtr->count;
 }
 
 int Item_Multi_FindCvarByValue(itemDef_t *item) {
-	char buff[1024];
-	float value = 0;
-	int i;
-	multiDef_t *multiPtr = (multiDef_t*)item->typeData;
-	if (multiPtr) {
-		if (multiPtr->strDef) {
-	    DC->getCVarString(item->cvar, buff, sizeof(buff));
-		} else {
-			value = DC->getCVarValue(item->cvar);
-		}
-		for (i = 0; i < multiPtr->count; i++) {
-			if (multiPtr->strDef) {
-				if (Q_stricmp(buff, multiPtr->cvarStr[i]) == 0) {
-					return i;
-				}
-			} else {
- 				if (multiPtr->cvarValue[i] == value) {
- 					return i;
- 				}
- 			}
- 		}
-	}
-	return 0;
+  char buff[1024];
+  float value = 0;
+  int i;
+  multiDef_t *multiPtr = (multiDef_t*)item->typeData;
+  if (multiPtr) {
+    if (multiPtr->strDef) {
+      DC->getCVarString(item->cvar, buff, sizeof(buff));
+    } else {
+      value = DC->getCVarValue(item->cvar);
+    }
+    for (i = 0; i < multiPtr->count; i++) {
+      if (multiPtr->strDef) {
+        if (Q_stricmp(buff, multiPtr->cvarStr[i]) == 0) {
+          return i;
+        }
+      } else {
+        if (multiPtr->cvarValue[i] == value) {
+          return i;
+        }
+      }
+    }
+  }
+  return 0;
 }
 
 const char *Item_Multi_Setting(itemDef_t *item) {
-	char buff[1024];
-	float value = 0;
-	int i;
-	multiDef_t *multiPtr = (multiDef_t*)item->typeData;
-	if (multiPtr) {
-		if (multiPtr->strDef) {
-	    DC->getCVarString(item->cvar, buff, sizeof(buff));
-		} else {
-			value = DC->getCVarValue(item->cvar);
-		}
-		for (i = 0; i < multiPtr->count; i++) {
-			if (multiPtr->strDef) {
-				if (Q_stricmp(buff, multiPtr->cvarStr[i]) == 0) {
-					return multiPtr->cvarList[i];
-				}
-			} else {
- 				if (multiPtr->cvarValue[i] == value) {
-					return multiPtr->cvarList[i];
- 				}
- 			}
- 		}
-	}
-	return "";
+  char buff[1024];
+  float value = 0;
+  int i;
+  multiDef_t *multiPtr = (multiDef_t*)item->typeData;
+  if (multiPtr) {
+    if (multiPtr->strDef) {
+      DC->getCVarString(item->cvar, buff, sizeof(buff));
+    } else {
+      value = DC->getCVarValue(item->cvar);
+    }
+    for (i = 0; i < multiPtr->count; i++) {
+      if (multiPtr->strDef) {
+        if (Q_stricmp(buff, multiPtr->cvarStr[i]) == 0) {
+          return multiPtr->cvarList[i];
+        }
+      } else {
+        if (multiPtr->cvarValue[i] == value) {
+          return multiPtr->cvarList[i];
+        }
+      }
+    }
+  }
+  return "";
 }
 
 qboolean Item_Multi_HandleKey(itemDef_t *item, int key) {
-	multiDef_t *multiPtr = (multiDef_t*)item->typeData;
-	if (multiPtr) {
-	  if (Rect_ContainsPoint(&item->window.rect, DC->cursorx, DC->cursory) && item->window.flags & WINDOW_HASFOCUS && item->cvar) {
-			if (key == K_MOUSE1 || key == K_ENTER || key == K_MOUSE2 || key == K_MOUSE3) {
-				int current = Item_Multi_FindCvarByValue(item) + 1;
-				int max = Item_Multi_CountSettings(item);
-				if ( current < 0 || current >= max ) {
-					current = 0;
-				}
-				if (multiPtr->strDef) {
-					DC->setCVar(item->cvar, multiPtr->cvarStr[current]);
-				} else {
-					float value = multiPtr->cvarValue[current];
-					if (((float)((int) value)) == value) {
-						DC->setCVar(item->cvar, va("%i", (int) value ));
-					}
-					else {
-						DC->setCVar(item->cvar, va("%f", value ));
-					}
-				}
-				return qtrue;
-			}
-		}
-	}
+  multiDef_t *multiPtr = (multiDef_t*)item->typeData;
+  if (multiPtr) {
+    if (Rect_ContainsPoint(&item->window.rect, DC->cursorx, DC->cursory) && item->window.flags & WINDOW_HASFOCUS && item->cvar) {
+      if (key == K_MOUSE1 || key == K_ENTER || key == K_MOUSE2 || key == K_MOUSE3) {
+        int current = Item_Multi_FindCvarByValue(item) + 1;
+        int max = Item_Multi_CountSettings(item);
+        if ( current < 0 || current >= max ) {
+          current = 0;
+        }
+        if (multiPtr->strDef) {
+          DC->setCVar(item->cvar, multiPtr->cvarStr[current]);
+        } else {
+          float value = multiPtr->cvarValue[current];
+          if (((float)((int) value)) == value) {
+            DC->setCVar(item->cvar, va("%i", (int) value ));
+          }
+          else {
+            DC->setCVar(item->cvar, va("%f", value ));
+          }
+        }
+        return qtrue;
+      }
+    }
+  }
   return qfalse;
 }
 
 qboolean Item_TextField_HandleKey(itemDef_t *item, int key) {
-	char buff[1024];
-	int len;
-	itemDef_t *newItem = NULL;
-	editFieldDef_t *editPtr = (editFieldDef_t*)item->typeData;
-
-	if (item->cvar) {
-
-		memset(buff, 0, sizeof(buff));
-		DC->getCVarString(item->cvar, buff, sizeof(buff));
-		len = strlen(buff);
-		if (editPtr->maxChars && len > editPtr->maxChars) {
-			len = editPtr->maxChars;
-		}
-		if ( key & K_CHAR_FLAG ) {
-			key &= ~K_CHAR_FLAG;
-
-
-			if (key == 'h' - 'a' + 1 )	{	// ctrl-h is backspace
-				if ( item->cursorPos > 0 ) {
-					memmove( &buff[item->cursorPos - 1], &buff[item->cursorPos], len + 1 - item->cursorPos);
-					item->cursorPos--;
-					if (item->cursorPos < editPtr->paintOffset) {
-						editPtr->paintOffset--;
-					}
-				}
-				DC->setCVar(item->cvar, buff);
-	    		return qtrue;
-			}
-
-
-			//
-			// ignore any non printable chars
-			//
-			if ( key < 32 || !item->cvar) {
-			    return qtrue;
-		    }
-
-			if (item->type == ITEM_TYPE_NUMERICFIELD) {
-				if (key < '0' || key > '9') {
-					return qfalse;
-				}
-			}
-
-			if (!DC->getOverstrikeMode()) {
-				if (( len == MAX_EDITFIELD - 1 ) || (editPtr->maxChars && len >= editPtr->maxChars)) {
-					return qtrue;
-				}
-				memmove( &buff[item->cursorPos + 1], &buff[item->cursorPos], len + 1 - item->cursorPos );
-			} else {
-				if (editPtr->maxChars && item->cursorPos >= editPtr->maxChars) {
-					return qtrue;
-				}
-			}
-
-			buff[item->cursorPos] = key;
-
-			DC->setCVar(item->cvar, buff);
-
-			if (item->cursorPos < len + 1) {
-				item->cursorPos++;
-				if (editPtr->maxPaintChars && item->cursorPos > editPtr->maxPaintChars) {
-					editPtr->paintOffset++;
-				}
-			}
-
-		} else {
-
-			if ( key == K_DEL || key == K_KP_DEL ) {
-				if ( item->cursorPos < len ) {
-					memmove( buff + item->cursorPos, buff + item->cursorPos + 1, len - item->cursorPos);
-					DC->setCVar(item->cvar, buff);
-				}
-				return qtrue;
-			}
-
-			if ( key == K_RIGHTARROW || key == K_KP_RIGHTARROW ) 
-			{
-				if (editPtr->maxPaintChars && item->cursorPos >= editPtr->maxPaintChars && item->cursorPos < len) {
-					item->cursorPos++;
-					editPtr->paintOffset++;
-					return qtrue;
-				}
-				if (item->cursorPos < len) {
-					item->cursorPos++;
-				} 
-				return qtrue;
-			}
-
-			if ( key == K_LEFTARROW || key == K_KP_LEFTARROW ) 
-			{
-				if ( item->cursorPos > 0 ) {
-					item->cursorPos--;
-				}
-				if (item->cursorPos < editPtr->paintOffset) {
-					editPtr->paintOffset--;
-				}
-				return qtrue;
-			}
-
-			if ( key == K_HOME || key == K_KP_HOME) {// || ( tolower(key) == 'a' && trap_Key_IsDown( K_CTRL ) ) ) {
-				item->cursorPos = 0;
-				editPtr->paintOffset = 0;
-				return qtrue;
-			}
-
-			if ( key == K_END || key == K_KP_END)  {// ( tolower(key) == 'e' && trap_Key_IsDown( K_CTRL ) ) ) {
-				item->cursorPos = len;
-				if(item->cursorPos > editPtr->maxPaintChars) {
-					editPtr->paintOffset = len - editPtr->maxPaintChars;
-				}
-				return qtrue;
-			}
-
-			if ( key == K_INS || key == K_KP_INS ) {
-				DC->setOverstrikeMode(!DC->getOverstrikeMode());
-				return qtrue;
-			}
-		}
-
-		if (key == K_TAB || key == K_DOWNARROW || key == K_KP_DOWNARROW) {
-			newItem = Menu_SetNextCursorItem(item->parent);
-			if (newItem && (newItem->type == ITEM_TYPE_EDITFIELD || newItem->type == ITEM_TYPE_NUMERICFIELD)) {
-				g_editItem = newItem;
-			}
-		}
-
-		if (key == K_UPARROW || key == K_KP_UPARROW) {
-			newItem = Menu_SetPrevCursorItem(item->parent);
-			if (newItem && (newItem->type == ITEM_TYPE_EDITFIELD || newItem->type == ITEM_TYPE_NUMERICFIELD)) {
-				g_editItem = newItem;
-			}
-		}
-
-		if ( key == K_ENTER || key == K_KP_ENTER || key == K_ESCAPE)  {
-			return qfalse;
-		}
-
-		return qtrue;
-	}
-	return qfalse;
+  char buff[1024];
+  int len;
+  itemDef_t *newItem = NULL;
+  editFieldDef_t *editPtr = (editFieldDef_t*)item->typeData;
+
+  if (item->cvar) {
+
+    memset(buff, 0, sizeof(buff));
+    DC->getCVarString(item->cvar, buff, sizeof(buff));
+    len = strlen(buff);
+    if (editPtr->maxChars && len > editPtr->maxChars) {
+      len = editPtr->maxChars;
+    }
+    if ( key & K_CHAR_FLAG ) {
+      key &= ~K_CHAR_FLAG;
+
+
+      if (key == 'h' - 'a' + 1 )  { // ctrl-h is backspace
+        if ( item->cursorPos > 0 ) {
+          memmove( &buff[item->cursorPos - 1], &buff[item->cursorPos], len + 1 - item->cursorPos);
+          item->cursorPos--;
+          if (item->cursorPos < editPtr->paintOffset) {
+            editPtr->paintOffset--;
+          }
+        }
+        DC->setCVar(item->cvar, buff);
+          return qtrue;
+      }
+
+
+      //
+      // ignore any non printable chars
+      //
+      if ( key < 32 || !item->cvar) {
+          return qtrue;
+        }
+
+      if (item->type == ITEM_TYPE_NUMERICFIELD) {
+        if (key < '0' || key > '9') {
+          return qfalse;
+        }
+      }
+
+      if (!DC->getOverstrikeMode()) {
+        if (( len == MAX_EDITFIELD - 1 ) || (editPtr->maxChars && len >= editPtr->maxChars)) {
+          return qtrue;
+        }
+        memmove( &buff[item->cursorPos + 1], &buff[item->cursorPos], len + 1 - item->cursorPos );
+      } else {
+        if (editPtr->maxChars && item->cursorPos >= editPtr->maxChars) {
+          return qtrue;
+        }
+      }
+
+      buff[item->cursorPos] = key;
+
+      DC->setCVar(item->cvar, buff);
+
+      if (item->cursorPos < len + 1) {
+        item->cursorPos++;
+        if (editPtr->maxPaintChars && item->cursorPos > editPtr->maxPaintChars) {
+          editPtr->paintOffset++;
+        }
+      }
+
+    } else {
+
+      if ( key == K_DEL || key == K_KP_DEL ) {
+        if ( item->cursorPos < len ) {
+          memmove( buff + item->cursorPos, buff + item->cursorPos + 1, len - item->cursorPos);
+          DC->setCVar(item->cvar, buff);
+        }
+        return qtrue;
+      }
+
+      if ( key == K_RIGHTARROW || key == K_KP_RIGHTARROW ) 
+      {
+        if (editPtr->maxPaintChars && item->cursorPos >= editPtr->maxPaintChars && item->cursorPos < len) {
+          item->cursorPos++;
+          editPtr->paintOffset++;
+          return qtrue;
+        }
+        if (item->cursorPos < len) {
+          item->cursorPos++;
+        } 
+        return qtrue;
+      }
+
+      if ( key == K_LEFTARROW || key == K_KP_LEFTARROW ) 
+      {
+        if ( item->cursorPos > 0 ) {
+          item->cursorPos--;
+        }
+        if (item->cursorPos < editPtr->paintOffset) {
+          editPtr->paintOffset--;
+        }
+        return qtrue;
+      }
+
+      if ( key == K_HOME || key == K_KP_HOME) {// || ( tolower(key) == 'a' && trap_Key_IsDown( K_CTRL ) ) ) {
+        item->cursorPos = 0;
+        editPtr->paintOffset = 0;
+        return qtrue;
+      }
+
+      if ( key == K_END || key == K_KP_END)  {// ( tolower(key) == 'e' && trap_Key_IsDown( K_CTRL ) ) ) {
+        item->cursorPos = len;
+        if(item->cursorPos > editPtr->maxPaintChars) {
+          editPtr->paintOffset = len - editPtr->maxPaintChars;
+        }
+        return qtrue;
+      }
+
+      if ( key == K_INS || key == K_KP_INS ) {
+        DC->setOverstrikeMode(!DC->getOverstrikeMode());
+        return qtrue;
+      }
+    }
+
+    if (key == K_TAB || key == K_DOWNARROW || key == K_KP_DOWNARROW) {
+      newItem = Menu_SetNextCursorItem(item->parent);
+      if (newItem && (newItem->type == ITEM_TYPE_EDITFIELD || newItem->type == ITEM_TYPE_NUMERICFIELD)) {
+        g_editItem = newItem;
+      }
+    }
+
+    if (key == K_UPARROW || key == K_KP_UPARROW) {
+      newItem = Menu_SetPrevCursorItem(item->parent);
+      if (newItem && (newItem->type == ITEM_TYPE_EDITFIELD || newItem->type == ITEM_TYPE_NUMERICFIELD)) {
+        g_editItem = newItem;
+      }
+    }
+
+    if ( key == K_ENTER || key == K_KP_ENTER || key == K_ESCAPE)  {
+      return qfalse;
+    }
+
+    return qtrue;
+  }
+  return qfalse;
 
 }
 
 static void Scroll_ListBox_AutoFunc(void *p) {
-	scrollInfo_t *si = (scrollInfo_t*)p;
-	if (DC->realTime > si->nextScrollTime) { 
-		// need to scroll which is done by simulating a click to the item
-		// this is done a bit sideways as the autoscroll "knows" that the item is a listbox
-		// so it calls it directly
-		Item_ListBox_HandleKey(si->item, si->scrollKey, qtrue, qfalse);
-		si->nextScrollTime = DC->realTime + si->adjustValue; 
-	}
-
-	if (DC->realTime > si->nextAdjustTime) {
-		si->nextAdjustTime = DC->realTime + SCROLL_TIME_ADJUST;
-		if (si->adjustValue > SCROLL_TIME_FLOOR) {
-			si->adjustValue -= SCROLL_TIME_ADJUSTOFFSET;
-		}
-	}
+  scrollInfo_t *si = (scrollInfo_t*)p;
+  if (DC->realTime > si->nextScrollTime) { 
+    // need to scroll which is done by simulating a click to the item
+    // this is done a bit sideways as the autoscroll "knows" that the item is a listbox
+    // so it calls it directly
+    Item_ListBox_HandleKey(si->item, si->scrollKey, qtrue, qfalse);
+    si->nextScrollTime = DC->realTime + si->adjustValue; 
+  }
+
+  if (DC->realTime > si->nextAdjustTime) {
+    si->nextAdjustTime = DC->realTime + SCROLL_TIME_ADJUST;
+    if (si->adjustValue > SCROLL_TIME_FLOOR) {
+      si->adjustValue -= SCROLL_TIME_ADJUSTOFFSET;
+    }
+  }
 }
 
 static void Scroll_ListBox_ThumbFunc(void *p) {
-	scrollInfo_t *si = (scrollInfo_t*)p;
-	rectDef_t r;
-	int pos, max;
-
-	listBoxDef_t *listPtr = (listBoxDef_t*)si->item->typeData;
-	if (si->item->window.flags & WINDOW_HORIZONTAL) {
-		if (DC->cursorx == si->xStart) {
-			return;
-		}
-		r.x = si->item->window.rect.x + SCROLLBAR_SIZE + 1;
-		r.y = si->item->window.rect.y + si->item->window.rect.h - SCROLLBAR_SIZE - 1;
-		r.h = SCROLLBAR_SIZE;
-		r.w = si->item->window.rect.w - (SCROLLBAR_SIZE*2) - 2;
-		max = Item_ListBox_MaxScroll(si->item);
-		//
-		pos = (DC->cursorx - r.x - SCROLLBAR_SIZE/2) * max / (r.w - SCROLLBAR_SIZE);
-		if (pos < 0) {
-			pos = 0;
-		}
-		else if (pos > max) {
-			pos = max;
-		}
-		listPtr->startPos = pos;
-		si->xStart = DC->cursorx;
-	}
-	else if (DC->cursory != si->yStart) {
-
-		r.x = si->item->window.rect.x + si->item->window.rect.w - SCROLLBAR_SIZE - 1;
-		r.y = si->item->window.rect.y + SCROLLBAR_SIZE + 1;
-		r.h = si->item->window.rect.h - (SCROLLBAR_SIZE*2) - 2;
-		r.w = SCROLLBAR_SIZE;
-		max = Item_ListBox_MaxScroll(si->item);
-		//
-		pos = (DC->cursory - r.y - SCROLLBAR_SIZE/2) * max / (r.h - SCROLLBAR_SIZE);
-		if (pos < 0) {
-			pos = 0;
-		}
-		else if (pos > max) {
-			pos = max;
-		}
-		listPtr->startPos = pos;
-		si->yStart = DC->cursory;
-	}
-
-	if (DC->realTime > si->nextScrollTime) { 
-		// need to scroll which is done by simulating a click to the item
-		// this is done a bit sideways as the autoscroll "knows" that the item is a listbox
-		// so it calls it directly
-		Item_ListBox_HandleKey(si->item, si->scrollKey, qtrue, qfalse);
-		si->nextScrollTime = DC->realTime + si->adjustValue; 
-	}
-
-	if (DC->realTime > si->nextAdjustTime) {
-		si->nextAdjustTime = DC->realTime + SCROLL_TIME_ADJUST;
-		if (si->adjustValue > SCROLL_TIME_FLOOR) {
-			si->adjustValue -= SCROLL_TIME_ADJUSTOFFSET;
-		}
-	}
+  scrollInfo_t *si = (scrollInfo_t*)p;
+  rectDef_t r;
+  int pos, max;
+
+  listBoxDef_t *listPtr = (listBoxDef_t*)si->item->typeData;
+  if (si->item->window.flags & WINDOW_HORIZONTAL) {
+    if (DC->cursorx == si->xStart) {
+      return;
+    }
+    r.x = si->item->window.rect.x + SCROLLBAR_SIZE + 1;
+    r.y = si->item->window.rect.y + si->item->window.rect.h - SCROLLBAR_SIZE - 1;
+    r.h = SCROLLBAR_SIZE;
+    r.w = si->item->window.rect.w - (SCROLLBAR_SIZE*2) - 2;
+    max = Item_ListBox_MaxScroll(si->item);
+    //
+    pos = (DC->cursorx - r.x - SCROLLBAR_SIZE/2) * max / (r.w - SCROLLBAR_SIZE);
+    if (pos < 0) {
+      pos = 0;
+    }
+    else if (pos > max) {
+      pos = max;
+    }
+    listPtr->startPos = pos;
+    si->xStart = DC->cursorx;
+  }
+  else if (DC->cursory != si->yStart) {
+
+    r.x = si->item->window.rect.x + si->item->window.rect.w - SCROLLBAR_SIZE - 1;
+    r.y = si->item->window.rect.y + SCROLLBAR_SIZE + 1;
+    r.h = si->item->window.rect.h - (SCROLLBAR_SIZE*2) - 2;
+    r.w = SCROLLBAR_SIZE;
+    max = Item_ListBox_MaxScroll(si->item);
+    //
+    pos = (DC->cursory - r.y - SCROLLBAR_SIZE/2) * max / (r.h - SCROLLBAR_SIZE);
+    if (pos < 0) {
+      pos = 0;
+    }
+    else if (pos > max) {
+      pos = max;
+    }
+    listPtr->startPos = pos;
+    si->yStart = DC->cursory;
+  }
+
+  if (DC->realTime > si->nextScrollTime) { 
+    // need to scroll which is done by simulating a click to the item
+    // this is done a bit sideways as the autoscroll "knows" that the item is a listbox
+    // so it calls it directly
+    Item_ListBox_HandleKey(si->item, si->scrollKey, qtrue, qfalse);
+    si->nextScrollTime = DC->realTime + si->adjustValue; 
+  }
+
+  if (DC->realTime > si->nextAdjustTime) {
+    si->nextAdjustTime = DC->realTime + SCROLL_TIME_ADJUST;
+    if (si->adjustValue > SCROLL_TIME_FLOOR) {
+      si->adjustValue -= SCROLL_TIME_ADJUSTOFFSET;
+    }
+  }
 }
 
 static void Scroll_Slider_ThumbFunc(void *p) {
-	float x, value, cursorx;
-	scrollInfo_t *si = (scrollInfo_t*)p;
-	editFieldDef_t *editDef = si->item->typeData;
-
-	if (si->item->text) {
-		x = si->item->textRect.x + si->item->textRect.w + 8;
-	} else {
-		x = si->item->window.rect.x;
-	}
-
-	cursorx = DC->cursorx;
-
-	if (cursorx < x) {
-		cursorx = x;
-	} else if (cursorx > x + SLIDER_WIDTH) {
-		cursorx = x + SLIDER_WIDTH;
-	}
-	value = cursorx - x;
-	value /= SLIDER_WIDTH;
-	value *= (editDef->maxVal - editDef->minVal);
-	value += editDef->minVal;
-	DC->setCVar(si->item->cvar, va("%f", value));
+  float x, value, cursorx;
+  scrollInfo_t *si = (scrollInfo_t*)p;
+  editFieldDef_t *editDef = si->item->typeData;
+
+  if (si->item->text) {
+    x = si->item->textRect.x + si->item->textRect.w + 8;
+  } else {
+    x = si->item->window.rect.x;
+  }
+
+  cursorx = DC->cursorx;
+
+  if (cursorx < x) {
+    cursorx = x;
+  } else if (cursorx > x + SLIDER_WIDTH) {
+    cursorx = x + SLIDER_WIDTH;
+  }
+  value = cursorx - x;
+  value /= SLIDER_WIDTH;
+  value *= (editDef->maxVal - editDef->minVal);
+  value += editDef->minVal;
+  DC->setCVar(si->item->cvar, va("%f", value));
 }
 
 void Item_StartCapture(itemDef_t *item, int key) {
-	int flags;
-	switch (item->type) {
+  int flags;
+  switch (item->type) {
     case ITEM_TYPE_EDITFIELD:
     case ITEM_TYPE_NUMERICFIELD:
 
-		case ITEM_TYPE_LISTBOX:
-		{
-			flags = Item_ListBox_OverLB(item, DC->cursorx, DC->cursory);
-			if (flags & (WINDOW_LB_LEFTARROW | WINDOW_LB_RIGHTARROW)) {
-				scrollInfo.nextScrollTime = DC->realTime + SCROLL_TIME_START;
-				scrollInfo.nextAdjustTime = DC->realTime + SCROLL_TIME_ADJUST;
-				scrollInfo.adjustValue = SCROLL_TIME_START;
-				scrollInfo.scrollKey = key;
-				scrollInfo.scrollDir = (flags & WINDOW_LB_LEFTARROW) ? qtrue : qfalse;
-				scrollInfo.item = item;
-				captureData = &scrollInfo;
-				captureFunc = &Scroll_ListBox_AutoFunc;
-				itemCapture = item;
-			} else if (flags & WINDOW_LB_THUMB) {
-				scrollInfo.scrollKey = key;
-				scrollInfo.item = item;
-				scrollInfo.xStart = DC->cursorx;
-				scrollInfo.yStart = DC->cursory;
-				captureData = &scrollInfo;
-				captureFunc = &Scroll_ListBox_ThumbFunc;
-				itemCapture = item;
-			}
-			break;
-		}
-		case ITEM_TYPE_SLIDER:
-		{
-			flags = Item_Slider_OverSlider(item, DC->cursorx, DC->cursory);
-			if (flags & WINDOW_LB_THUMB) {
-				scrollInfo.scrollKey = key;
-				scrollInfo.item = item;
-				scrollInfo.xStart = DC->cursorx;
-				scrollInfo.yStart = DC->cursory;
-				captureData = &scrollInfo;
-				captureFunc = &Scroll_Slider_ThumbFunc;
-				itemCapture = item;
-			}
-			break;
-		}
-	}
+    case ITEM_TYPE_LISTBOX:
+    {
+      flags = Item_ListBox_OverLB(item, DC->cursorx, DC->cursory);
+      if (flags & (WINDOW_LB_LEFTARROW | WINDOW_LB_RIGHTARROW)) {
+        scrollInfo.nextScrollTime = DC->realTime + SCROLL_TIME_START;
+        scrollInfo.nextAdjustTime = DC->realTime + SCROLL_TIME_ADJUST;
+        scrollInfo.adjustValue = SCROLL_TIME_START;
+        scrollInfo.scrollKey = key;
+        scrollInfo.scrollDir = (flags & WINDOW_LB_LEFTARROW) ? qtrue : qfalse;
+        scrollInfo.item = item;
+        captureData = &scrollInfo;
+        captureFunc = &Scroll_ListBox_AutoFunc;
+        itemCapture = item;
+      } else if (flags & WINDOW_LB_THUMB) {
+        scrollInfo.scrollKey = key;
+        scrollInfo.item = item;
+        scrollInfo.xStart = DC->cursorx;
+        scrollInfo.yStart = DC->cursory;
+        captureData = &scrollInfo;
+        captureFunc = &Scroll_ListBox_ThumbFunc;
+        itemCapture = item;
+      }
+      break;
+    }
+    case ITEM_TYPE_SLIDER:
+    {
+      flags = Item_Slider_OverSlider(item, DC->cursorx, DC->cursory);
+      if (flags & WINDOW_LB_THUMB) {
+        scrollInfo.scrollKey = key;
+        scrollInfo.item = item;
+        scrollInfo.xStart = DC->cursorx;
+        scrollInfo.yStart = DC->cursory;
+        captureData = &scrollInfo;
+        captureFunc = &Scroll_Slider_ThumbFunc;
+        itemCapture = item;
+      }
+      break;
+    }
+  }
 }
 
 void Item_StopCapture(itemDef_t *item) {
@@ -2305,63 +2305,63 @@ void Item_StopCapture(itemDef_t *item) {
 }
 
 qboolean Item_Slider_HandleKey(itemDef_t *item, int key, qboolean down) {
-	float x, value, width, work;
-
-	//DC->Print("slider handle key\n");
-	if (item->window.flags & WINDOW_HASFOCUS && item->cvar && Rect_ContainsPoint(&item->window.rect, DC->cursorx, DC->cursory)) {
-		if (key == K_MOUSE1 || key == K_ENTER || key == K_MOUSE2 || key == K_MOUSE3) {
-			editFieldDef_t *editDef = item->typeData;
-			if (editDef) {
-				rectDef_t testRect;
-				width = SLIDER_WIDTH;
-				if (item->text) {
-					x = item->textRect.x + item->textRect.w + 8;
-				} else {
-					x = item->window.rect.x;
-				}
-
-				testRect = item->window.rect;
-				testRect.x = x;
-				value = (float)SLIDER_THUMB_WIDTH / 2;
-				testRect.x -= value;
-				//DC->Print("slider x: %f\n", testRect.x);
-				testRect.w = (SLIDER_WIDTH + (float)SLIDER_THUMB_WIDTH / 2);
-				//DC->Print("slider w: %f\n", testRect.w);
-				if (Rect_ContainsPoint(&testRect, DC->cursorx, DC->cursory)) {
-					work = DC->cursorx - x;
-					value = work / width;
-					value *= (editDef->maxVal - editDef->minVal);
-					// vm fuckage
-					// value = (((float)(DC->cursorx - x)/ SLIDER_WIDTH) * (editDef->maxVal - editDef->minVal));
-					value += editDef->minVal;
-					DC->setCVar(item->cvar, va("%f", value));
-					return qtrue;
-				}
-			}
-		}
-	}
-	DC->Print("slider handle key exit\n");
-	return qfalse;
+  float x, value, width, work;
+
+  //DC->Print("slider handle key\n");
+  if (item->window.flags & WINDOW_HASFOCUS && item->cvar && Rect_ContainsPoint(&item->window.rect, DC->cursorx, DC->cursory)) {
+    if (key == K_MOUSE1 || key == K_ENTER || key == K_MOUSE2 || key == K_MOUSE3) {
+      editFieldDef_t *editDef = item->typeData;
+      if (editDef) {
+        rectDef_t testRect;
+        width = SLIDER_WIDTH;
+        if (item->text) {
+          x = item->textRect.x + item->textRect.w + 8;
+        } else {
+          x = item->window.rect.x;
+        }
+
+        testRect = item->window.rect;
+        testRect.x = x;
+        value = (float)SLIDER_THUMB_WIDTH / 2;
+        testRect.x -= value;
+        //DC->Print("slider x: %f\n", testRect.x);
+        testRect.w = (SLIDER_WIDTH + (float)SLIDER_THUMB_WIDTH / 2);
+        //DC->Print("slider w: %f\n", testRect.w);
+        if (Rect_ContainsPoint(&testRect, DC->cursorx, DC->cursory)) {
+          work = DC->cursorx - x;
+          value = work / width;
+          value *= (editDef->maxVal - editDef->minVal);
+          // vm fuckage
+          // value = (((float)(DC->cursorx - x)/ SLIDER_WIDTH) * (editDef->maxVal - editDef->minVal));
+          value += editDef->minVal;
+          DC->setCVar(item->cvar, va("%f", value));
+          return qtrue;
+        }
+      }
+    }
+  }
+  DC->Print("slider handle key exit\n");
+  return qfalse;
 }
 
 
 qboolean Item_HandleKey(itemDef_t *item, int key, qboolean down) {
 
-	if (itemCapture) {
-		Item_StopCapture(itemCapture);
-		itemCapture = NULL;
-		captureFunc = voidFunction;
-		captureData = NULL;
-	} else {
-	  // bk001206 - parentheses
-		if ( down && ( key == K_MOUSE1 || key == K_MOUSE2 || key == K_MOUSE3 ) ) {
-			Item_StartCapture(item, key);
-		}
-	}
-
-	if (!down) {
-		return qfalse;
-	}
+  if (itemCapture) {
+    Item_StopCapture(itemCapture);
+    itemCapture = NULL;
+    captureFunc = voidFunction;
+    captureData = NULL;
+  } else {
+    // bk001206 - parentheses
+    if ( down && ( key == K_MOUSE1 || key == K_MOUSE2 || key == K_MOUSE3 ) ) {
+      Item_StartCapture(item, key);
+    }
+  }
+
+  if (!down) {
+    return qfalse;
+  }
 
   switch (item->type) {
     case ITEM_TYPE_BUTTON:
@@ -2394,7 +2394,7 @@ qboolean Item_HandleKey(itemDef_t *item, int key, qboolean down) {
       return Item_OwnerDraw_HandleKey(item, key);
       break;
     case ITEM_TYPE_BIND:
-			return Item_Bind_HandleKey(item, key, down);
+      return Item_Bind_HandleKey(item, key, down);
       break;
     case ITEM_TYPE_SLIDER:
       return Item_Slider_HandleKey(item, key, down);
@@ -2418,7 +2418,7 @@ void Item_Action(itemDef_t *item) {
 
 itemDef_t *Menu_SetPrevCursorItem(menuDef_t *menu) {
   qboolean wrapped = qfalse;
-	int oldCursor = menu->cursorItem;
+  int oldCursor = menu->cursorItem;
   
   if (menu->cursorItem < 0) {
     menu->cursorItem = menu->itemCount-1;
@@ -2433,20 +2433,20 @@ itemDef_t *Menu_SetPrevCursorItem(menuDef_t *menu) {
       menu->cursorItem = menu->itemCount -1;
     }
 
-		if (Item_SetFocus(menu->items[menu->cursorItem], DC->cursorx, DC->cursory)) {
-			Menu_HandleMouseMove(menu, menu->items[menu->cursorItem]->window.rect.x + 1, menu->items[menu->cursorItem]->window.rect.y + 1);
+    if (Item_SetFocus(menu->items[menu->cursorItem], DC->cursorx, DC->cursory)) {
+      Menu_HandleMouseMove(menu, menu->items[menu->cursorItem]->window.rect.x + 1, menu->items[menu->cursorItem]->window.rect.y + 1);
       return menu->items[menu->cursorItem];
     }
   }
-	menu->cursorItem = oldCursor;
-	return NULL;
+  menu->cursorItem = oldCursor;
+  return NULL;
 
 }
 
 itemDef_t *Menu_SetNextCursorItem(menuDef_t *menu) {
 
   qboolean wrapped = qfalse;
-	int oldCursor = menu->cursorItem;
+  int oldCursor = menu->cursorItem;
 
 
   if (menu->cursorItem == -1) {
@@ -2461,719 +2461,720 @@ itemDef_t *Menu_SetNextCursorItem(menuDef_t *menu) {
       wrapped = qtrue;
       menu->cursorItem = 0;
     }
-		if (Item_SetFocus(menu->items[menu->cursorItem], DC->cursorx, DC->cursory)) {
-			Menu_HandleMouseMove(menu, menu->items[menu->cursorItem]->window.rect.x + 1, menu->items[menu->cursorItem]->window.rect.y + 1);
+    if (Item_SetFocus(menu->items[menu->cursorItem], DC->cursorx, DC->cursory)) {
+      Menu_HandleMouseMove(menu, menu->items[menu->cursorItem]->window.rect.x + 1, menu->items[menu->cursorItem]->window.rect.y + 1);
       return menu->items[menu->cursorItem];
     }
     
   }
 
-	menu->cursorItem = oldCursor;
-	return NULL;
+  menu->cursorItem = oldCursor;
+  return NULL;
 }
 
 static void Window_CloseCinematic(windowDef_t *window) {
-	if (window->style == WINDOW_STYLE_CINEMATIC && window->cinematic >= 0) {
-		DC->stopCinematic(window->cinematic);
-		window->cinematic = -1;
-	}
+  if (window->style == WINDOW_STYLE_CINEMATIC && window->cinematic >= 0) {
+    DC->stopCinematic(window->cinematic);
+    window->cinematic = -1;
+  }
 }
 
 static void Menu_CloseCinematics(menuDef_t *menu) {
-	if (menu) {
-		int i;
-		Window_CloseCinematic(&menu->window);
-	  for (i = 0; i < menu->itemCount; i++) {
-		  Window_CloseCinematic(&menu->items[i]->window);
-			if (menu->items[i]->type == ITEM_TYPE_OWNERDRAW) {
-				DC->stopCinematic(0-menu->items[i]->window.ownerDraw);
-			}
-	  }
-	}
+  if (menu) {
+    int i;
+    Window_CloseCinematic(&menu->window);
+    for (i = 0; i < menu->itemCount; i++) {
+      Window_CloseCinematic(&menu->items[i]->window);
+      if (menu->items[i]->type == ITEM_TYPE_OWNERDRAW) {
+        DC->stopCinematic(0-menu->items[i]->window.ownerDraw);
+      }
+    }
+  }
 }
 
 static void Display_CloseCinematics() {
-	int i;
-	for (i = 0; i < menuCount; i++) {
-		Menu_CloseCinematics(&Menus[i]);
-	}
+  int i;
+  for (i = 0; i < menuCount; i++) {
+    Menu_CloseCinematics(&Menus[i]);
+  }
 }
 
 void  Menus_Activate(menuDef_t *menu) {
-	menu->window.flags |= (WINDOW_HASFOCUS | WINDOW_VISIBLE);
-	if (menu->onOpen) {
-		itemDef_t item;
-		item.parent = menu;
-		Item_RunScript(&item, menu->onOpen);
-	}
+  menu->window.flags |= (WINDOW_HASFOCUS | WINDOW_VISIBLE);
+  if (menu->onOpen) {
+    itemDef_t item;
+    item.parent = menu;
+    Item_RunScript(&item, menu->onOpen);
+  }
 
-	if (menu->soundName && *menu->soundName) {
-//		DC->stopBackgroundTrack();					// you don't want to do this since it will reset s_rawend
-		DC->startBackgroundTrack(menu->soundName, menu->soundName);
-	}
+  if (menu->soundName && *menu->soundName) {
+//    DC->stopBackgroundTrack();          // you don't want to do this since it will reset s_rawend
+    DC->startBackgroundTrack(menu->soundName, menu->soundName);
+  }
 
-	Display_CloseCinematics();
+  Display_CloseCinematics();
 
 }
 
 int Display_VisibleMenuCount() {
-	int i, count;
-	count = 0;
-	for (i = 0; i < menuCount; i++) {
-		if (Menus[i].window.flags & (WINDOW_FORCED | WINDOW_VISIBLE)) {
-			count++;
-		}
-	}
-	return count;
+  int i, count;
+  count = 0;
+  for (i = 0; i < menuCount; i++) {
+    if (Menus[i].window.flags & (WINDOW_FORCED | WINDOW_VISIBLE)) {
+      count++;
+    }
+  }
+  return count;
 }
 
 void Menus_HandleOOBClick(menuDef_t *menu, int key, qboolean down) {
-	if (menu) {
-		int i;
-		// basically the behaviour we are looking for is if there are windows in the stack.. see if 
-		// the cursor is within any of them.. if not close them otherwise activate them and pass the 
-		// key on.. force a mouse move to activate focus and script stuff 
-		if (down && menu->window.flags & WINDOW_OOB_CLICK) {
-			Menu_RunCloseScript(menu);
-			menu->window.flags &= ~(WINDOW_HASFOCUS | WINDOW_VISIBLE);
-		}
-
-		for (i = 0; i < menuCount; i++) {
-			if (Menu_OverActiveItem(&Menus[i], DC->cursorx, DC->cursory)) {
-				Menu_RunCloseScript(menu);
-				menu->window.flags &= ~(WINDOW_HASFOCUS | WINDOW_VISIBLE);
-				Menus_Activate(&Menus[i]);
-				Menu_HandleMouseMove(&Menus[i], DC->cursorx, DC->cursory);
-				Menu_HandleKey(&Menus[i], key, down);
-			}
-		}
-
-		if (Display_VisibleMenuCount() == 0) {
-			if (DC->Pause) {
-				DC->Pause(qfalse);
-			}
-		}
-		Display_CloseCinematics();
-	}
+  if (menu) {
+    int i;
+    // basically the behaviour we are looking for is if there are windows in the stack.. see if 
+    // the cursor is within any of them.. if not close them otherwise activate them and pass the 
+    // key on.. force a mouse move to activate focus and script stuff 
+    if (down && menu->window.flags & WINDOW_OOB_CLICK) {
+      Menu_RunCloseScript(menu);
+      menu->window.flags &= ~(WINDOW_HASFOCUS | WINDOW_VISIBLE);
+    }
+
+    for (i = 0; i < menuCount; i++) {
+      if (Menu_OverActiveItem(&Menus[i], DC->cursorx, DC->cursory)) {
+        Menu_RunCloseScript(menu);
+        menu->window.flags &= ~(WINDOW_HASFOCUS | WINDOW_VISIBLE);
+        Menus_Activate(&Menus[i]);
+        Menu_HandleMouseMove(&Menus[i], DC->cursorx, DC->cursory);
+        Menu_HandleKey(&Menus[i], key, down);
+      }
+    }
+
+    if (Display_VisibleMenuCount() == 0) {
+      if (DC->Pause) {
+        DC->Pause(qfalse);
+      }
+    }
+    Display_CloseCinematics();
+  }
 }
 
 static rectDef_t *Item_CorrectedTextRect(itemDef_t *item) {
-	static rectDef_t rect;
-	memset(&rect, 0, sizeof(rectDef_t));
-	if (item) {
-		rect = item->textRect;
-		if (rect.w) {
-			rect.y -= rect.h;
-		}
-	}
-	return &rect;
+  static rectDef_t rect;
+  memset(&rect, 0, sizeof(rectDef_t));
+  if (item) {
+    rect = item->textRect;
+    if (rect.w) {
+      rect.y -= rect.h;
+    }
+  }
+  return &rect;
 }
 
 void Menu_HandleKey(menuDef_t *menu, int key, qboolean down) {
-	int i;
-	itemDef_t *item = NULL;
-	qboolean inHandler = qfalse;
-
-	if (inHandler) {
-		return;
-	}
-
-	inHandler = qtrue;
-	if (g_waitingForKey && down) {
-		Item_Bind_HandleKey(g_bindItem, key, down);
-		inHandler = qfalse;
-		return;
-	}
-
-	if (g_editingField && down) {
-		if (!Item_TextField_HandleKey(g_editItem, key)) {
-			g_editingField = qfalse;
-			g_editItem = NULL;
-			inHandler = qfalse;
-			return;
-		} else if (key == K_MOUSE1 || key == K_MOUSE2 || key == K_MOUSE3) {
-			g_editingField = qfalse;
-			g_editItem = NULL;
-			Display_MouseMove(NULL, DC->cursorx, DC->cursory);
-		} else if (key == K_TAB || key == K_UPARROW || key == K_DOWNARROW) {
-			return;
-		}
-	}
-
-	if (menu == NULL) {
-		inHandler = qfalse;
-		return;
-	}
-
-		// see if the mouse is within the window bounds and if so is this a mouse click
-	if (down && !(menu->window.flags & WINDOW_POPUP) && !Rect_ContainsPoint(&menu->window.rect, DC->cursorx, DC->cursory)) {
-		static qboolean inHandleKey = qfalse;
-		// bk001206 - parentheses
-		if (!inHandleKey && ( key == K_MOUSE1 || key == K_MOUSE2 || key == K_MOUSE3 ) ) {
-			inHandleKey = qtrue;
-			Menus_HandleOOBClick(menu, key, down);
-			inHandleKey = qfalse;
-			inHandler = qfalse;
-			return;
-		}
-	}
-
-	// get the item with focus
-	for (i = 0; i < menu->itemCount; i++) {
-		if (menu->items[i]->window.flags & WINDOW_HASFOCUS) {
-			item = menu->items[i];
-		}
-	}
-
-	if (item != NULL) {
-		if (Item_HandleKey(item, key, down)) {
-			Item_Action(item);
-			inHandler = qfalse;
-			return;
-		}
-	}
-
-	if (!down) {
-		inHandler = qfalse;
-		return;
-	}
-
-	// default handling
-	switch ( key ) {
-
-		case K_F11:
-			if (DC->getCVarValue("developer")) {
-				debugMode ^= 1;
-			}
-			break;
-
-		case K_F12:
-			if (DC->getCVarValue("developer")) {
-				DC->executeText(EXEC_APPEND, "screenshot\n");
-			}
-			break;
-		case K_KP_UPARROW:
-		case K_UPARROW:
-			Menu_SetPrevCursorItem(menu);
-			break;
-
-		case K_ESCAPE:
-			if (!g_waitingForKey && menu->onESC) {
-				itemDef_t it;
-		    it.parent = menu;
-		    Item_RunScript(&it, menu->onESC);
-			}
-			break;
-		case K_TAB:
-		case K_KP_DOWNARROW:
-		case K_DOWNARROW:
-			Menu_SetNextCursorItem(menu);
-			break;
-
-		case K_MOUSE1:
-		case K_MOUSE2:
-			if (item) {
-				if (item->type == ITEM_TYPE_TEXT) {
-					if (Rect_ContainsPoint(Item_CorrectedTextRect(item), DC->cursorx, DC->cursory)) {
-						Item_Action(item);
-					}
-				} else if (item->type == ITEM_TYPE_EDITFIELD || item->type == ITEM_TYPE_NUMERICFIELD) {
-					if (Rect_ContainsPoint(&item->window.rect, DC->cursorx, DC->cursory)) {
-						item->cursorPos = 0;
-						g_editingField = qtrue;
-						g_editItem = item;
-						DC->setOverstrikeMode(qtrue);
-					}
-				} else {
-					if (Rect_ContainsPoint(&item->window.rect, DC->cursorx, DC->cursory)) {
-						Item_Action(item);
-					}
-				}
-			}
-			break;
-
-		case K_JOY1:
-		case K_JOY2:
-		case K_JOY3:
-		case K_JOY4:
-		case K_AUX1:
-		case K_AUX2:
-		case K_AUX3:
-		case K_AUX4:
-		case K_AUX5:
-		case K_AUX6:
-		case K_AUX7:
-		case K_AUX8:
-		case K_AUX9:
-		case K_AUX10:
-		case K_AUX11:
-		case K_AUX12:
-		case K_AUX13:
-		case K_AUX14:
-		case K_AUX15:
-		case K_AUX16:
-			break;
-		case K_KP_ENTER:
-		case K_ENTER:
-			if (item) {
-				if (item->type == ITEM_TYPE_EDITFIELD || item->type == ITEM_TYPE_NUMERICFIELD) {
-					item->cursorPos = 0;
-					g_editingField = qtrue;
-					g_editItem = item;
-					DC->setOverstrikeMode(qtrue);
-				} else {
-						Item_Action(item);
-				}
-			}
-			break;
-	}
-	inHandler = qfalse;
+  int i;
+  itemDef_t *item = NULL;
+  qboolean inHandler = qfalse;
+
+  if (inHandler) {
+    return;
+  }
+
+  inHandler = qtrue;
+  if (g_waitingForKey && down) {
+    Item_Bind_HandleKey(g_bindItem, key, down);
+    inHandler = qfalse;
+    return;
+  }
+
+  if (g_editingField && down) {
+    if (!Item_TextField_HandleKey(g_editItem, key)) {
+      g_editingField = qfalse;
+      g_editItem = NULL;
+      inHandler = qfalse;
+      return;
+    } else if (key == K_MOUSE1 || key == K_MOUSE2 || key == K_MOUSE3) {
+      g_editingField = qfalse;
+      g_editItem = NULL;
+      Display_MouseMove(NULL, DC->cursorx, DC->cursory);
+    } else if (key == K_TAB || key == K_UPARROW || key == K_DOWNARROW) {
+      return;
+    }
+  }
+
+  if (menu == NULL) {
+    inHandler = qfalse;
+    return;
+  }
+
+    // see if the mouse is within the window bounds and if so is this a mouse click
+  if (down && !(menu->window.flags & WINDOW_POPUP) && !Rect_ContainsPoint(&menu->window.rect, DC->cursorx, DC->cursory)) {
+    static qboolean inHandleKey = qfalse;
+    // bk001206 - parentheses
+    if (!inHandleKey && ( key == K_MOUSE1 || key == K_MOUSE2 || key == K_MOUSE3 ) ) {
+      inHandleKey = qtrue;
+      Menus_HandleOOBClick(menu, key, down);
+      inHandleKey = qfalse;
+      inHandler = qfalse;
+      return;
+    }
+  }
+
+  // get the item with focus
+  for (i = 0; i < menu->itemCount; i++) {
+    if (menu->items[i]->window.flags & WINDOW_HASFOCUS) {
+      item = menu->items[i];
+    }
+  }
+
+  if (item != NULL) {
+    if (Item_HandleKey(item, key, down)) {
+      Item_Action(item);
+      inHandler = qfalse;
+      return;
+    }
+  }
+
+  if (!down) {
+    inHandler = qfalse;
+    return;
+  }
+
+  // default handling
+  switch ( key ) {
+
+    case K_F11:
+      if (DC->getCVarValue("developer")) {
+        debugMode ^= 1;
+      }
+      break;
+
+    case K_F12:
+      if (DC->getCVarValue("developer")) {
+        DC->executeText(EXEC_APPEND, "screenshot\n");
+      }
+      break;
+    case K_KP_UPARROW:
+    case K_UPARROW:
+      Menu_SetPrevCursorItem(menu);
+      break;
+
+    case K_ESCAPE:
+      if (!g_waitingForKey && menu->onESC) {
+        itemDef_t it;
+        it.parent = menu;
+        Item_RunScript(&it, menu->onESC);
+      }
+      break;
+    case K_TAB:
+    case K_KP_DOWNARROW:
+    case K_DOWNARROW:
+      Menu_SetNextCursorItem(menu);
+      break;
+
+    case K_MOUSE1:
+    case K_MOUSE2:
+      if (item) {
+        if (item->type == ITEM_TYPE_TEXT) {
+          if (Rect_ContainsPoint(Item_CorrectedTextRect(item), DC->cursorx, DC->cursory)) {
+            Item_Action(item);
+          }
+        } else if (item->type == ITEM_TYPE_EDITFIELD || item->type == ITEM_TYPE_NUMERICFIELD) {
+          if (Rect_ContainsPoint(&item->window.rect, DC->cursorx, DC->cursory)) {
+            item->cursorPos = 0;
+            g_editingField = qtrue;
+            g_editItem = item;
+            DC->setOverstrikeMode(qtrue);
+          }
+        } else {
+          if (Rect_ContainsPoint(&item->window.rect, DC->cursorx, DC->cursory)) {
+            Item_Action(item);
+          }
+        }
+      }
+      break;
+
+    case K_JOY1:
+    case K_JOY2:
+    case K_JOY3:
+    case K_JOY4:
+    case K_AUX1:
+    case K_AUX2:
+    case K_AUX3:
+    case K_AUX4:
+    case K_AUX5:
+    case K_AUX6:
+    case K_AUX7:
+    case K_AUX8:
+    case K_AUX9:
+    case K_AUX10:
+    case K_AUX11:
+    case K_AUX12:
+    case K_AUX13:
+    case K_AUX14:
+    case K_AUX15:
+    case K_AUX16:
+      break;
+    case K_KP_ENTER:
+    case K_ENTER:
+      if (item) {
+        if (item->type == ITEM_TYPE_EDITFIELD || item->type == ITEM_TYPE_NUMERICFIELD) {
+          item->cursorPos = 0;
+          g_editingField = qtrue;
+          g_editItem = item;
+          DC->setOverstrikeMode(qtrue);
+        } else {
+            Item_Action(item);
+        }
+      }
+      break;
+  }
+  inHandler = qfalse;
 }
 
 void ToWindowCoords(float *x, float *y, windowDef_t *window) {
-	if (window->border != 0) {
-		*x += window->borderSize;
-		*y += window->borderSize;
-	} 
-	*x += window->rect.x;
-	*y += window->rect.y;
+  if (window->border != 0) {
+    *x += window->borderSize;
+    *y += window->borderSize;
+  } 
+  *x += window->rect.x;
+  *y += window->rect.y;
 }
 
 void Rect_ToWindowCoords(rectDef_t *rect, windowDef_t *window) {
-	ToWindowCoords(&rect->x, &rect->y, window);
+  ToWindowCoords(&rect->x, &rect->y, window);
 }
 
 void Item_SetTextExtents(itemDef_t *item, int *width, int *height, const char *text) {
-	const char *textPtr = (text) ? text : item->text;
-
-	if (textPtr == NULL ) {
-		return;
-	}
-
-	*width = item->textRect.w;
-	*height = item->textRect.h;
-
-	// keeps us from computing the widths and heights more than once
-	if (*width == 0 || (item->type == ITEM_TYPE_OWNERDRAW && item->textalignment == ITEM_ALIGN_CENTER)) {
-		int originalWidth = DC->textWidth(item->text, item->textscale, 0);
-
-		if (item->type == ITEM_TYPE_OWNERDRAW && (item->textalignment == ITEM_ALIGN_CENTER || item->textalignment == ITEM_ALIGN_RIGHT)) {
-			originalWidth += DC->ownerDrawWidth(item->window.ownerDraw, item->textscale);
-		} else if (item->type == ITEM_TYPE_EDITFIELD && item->textalignment == ITEM_ALIGN_CENTER && item->cvar) {
-			char buff[256];
-			DC->getCVarString(item->cvar, buff, 256);
-			originalWidth += DC->textWidth(buff, item->textscale, 0);
-		}
-
-		*width = DC->textWidth(textPtr, item->textscale, 0);
-		*height = DC->textHeight(textPtr, item->textscale, 0);
-		item->textRect.w = *width;
-		item->textRect.h = *height;
-		item->textRect.x = item->textalignx;
-		item->textRect.y = item->textaligny;
-		if (item->textalignment == ITEM_ALIGN_RIGHT) {
-			item->textRect.x = item->textalignx - originalWidth;
-		} else if (item->textalignment == ITEM_ALIGN_CENTER) {
-			item->textRect.x = item->textalignx - originalWidth / 2;
-		}
-
-		ToWindowCoords(&item->textRect.x, &item->textRect.y, &item->window);
-	}
+  const char *textPtr = (text) ? text : item->text;
+
+  if (textPtr == NULL ) {
+    return;
+  }
+
+  *width = item->textRect.w;
+  *height = item->textRect.h;
+
+  // keeps us from computing the widths and heights more than once
+  if (*width == 0 || (item->type == ITEM_TYPE_OWNERDRAW && item->textalignment == ITEM_ALIGN_CENTER)) {
+    int originalWidth = DC->textWidth(item->text, item->textscale, 0);
+
+    if (item->type == ITEM_TYPE_OWNERDRAW && (item->textalignment == ITEM_ALIGN_CENTER || item->textalignment == ITEM_ALIGN_RIGHT)) {
+      originalWidth += DC->ownerDrawWidth(item->window.ownerDraw, item->textscale);
+    } else if (item->type == ITEM_TYPE_EDITFIELD && item->textalignment == ITEM_ALIGN_CENTER && item->cvar) {
+      char buff[256];
+      DC->getCVarString(item->cvar, buff, 256);
+      originalWidth += DC->textWidth(buff, item->textscale, 0);
+    }
+
+    *width = DC->textWidth(textPtr, item->textscale, 0);
+    *height = DC->textHeight(textPtr, item->textscale, 0);
+    item->textRect.w = *width;
+    item->textRect.h = *height;
+    item->textRect.x = item->textalignx;
+    item->textRect.y = item->textaligny;
+    if (item->textalignment == ITEM_ALIGN_RIGHT) {
+      item->textRect.x = item->textalignx - originalWidth;
+    } else if (item->textalignment == ITEM_ALIGN_CENTER) {
+      item->textRect.x = item->textalignx - originalWidth / 2;
+    }
+
+    ToWindowCoords(&item->textRect.x, &item->textRect.y, &item->window);
+  }
 }
 
 void Item_TextColor(itemDef_t *item, vec4_t *newColor) {
-	vec4_t lowLight;
-	menuDef_t *parent = (menuDef_t*)item->parent;
-
-	Fade(&item->window.flags, &item->window.foreColor[3], parent->fadeClamp, &item->window.nextTime, parent->fadeCycle, qtrue, parent->fadeAmount);
-
-	if (item->window.flags & WINDOW_HASFOCUS) {
-		lowLight[0] = 0.8 * parent->focusColor[0]; 
-		lowLight[1] = 0.8 * parent->focusColor[1]; 
-		lowLight[2] = 0.8 * parent->focusColor[2]; 
-		lowLight[3] = 0.8 * parent->focusColor[3]; 
-		LerpColor(parent->focusColor,lowLight,*newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
-	} else if (item->textStyle == ITEM_TEXTSTYLE_BLINK && !((DC->realTime/BLINK_DIVISOR) & 1)) {
-		lowLight[0] = 0.8 * item->window.foreColor[0]; 
-		lowLight[1] = 0.8 * item->window.foreColor[1]; 
-		lowLight[2] = 0.8 * item->window.foreColor[2]; 
-		lowLight[3] = 0.8 * item->window.foreColor[3]; 
-		LerpColor(item->window.foreColor,lowLight,*newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
-	} else {
-		memcpy(newColor, &item->window.foreColor, sizeof(vec4_t));
-		// items can be enabled and disabled based on cvars
-	}
-
-	if (item->enableCvar && *item->enableCvar && item->cvarTest && *item->cvarTest) {
-		if (item->cvarFlags & (CVAR_ENABLE | CVAR_DISABLE) && !Item_EnableShowViaCvar(item, CVAR_ENABLE)) {
-			memcpy(newColor, &parent->disableColor, sizeof(vec4_t));
-		}
-	}
+  vec4_t lowLight;
+  menuDef_t *parent = (menuDef_t*)item->parent;
+
+  Fade(&item->window.flags, &item->window.foreColor[3], parent->fadeClamp, &item->window.nextTime, parent->fadeCycle, qtrue, parent->fadeAmount);
+
+  if (item->window.flags & WINDOW_HASFOCUS) {
+    lowLight[0] = 0.8 * parent->focusColor[0]; 
+    lowLight[1] = 0.8 * parent->focusColor[1]; 
+    lowLight[2] = 0.8 * parent->focusColor[2]; 
+    lowLight[3] = 0.8 * parent->focusColor[3]; 
+    LerpColor(parent->focusColor,lowLight,*newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
+  } else if (item->textStyle == ITEM_TEXTSTYLE_BLINK && !((DC->realTime/BLINK_DIVISOR) & 1)) {
+    lowLight[0] = 0.8 * item->window.foreColor[0]; 
+    lowLight[1] = 0.8 * item->window.foreColor[1]; 
+    lowLight[2] = 0.8 * item->window.foreColor[2]; 
+    lowLight[3] = 0.8 * item->window.foreColor[3]; 
+    LerpColor(item->window.foreColor,lowLight,*newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
+  } else {
+    memcpy(newColor, &item->window.foreColor, sizeof(vec4_t));
+    // items can be enabled and disabled based on cvars
+  }
+
+  if (item->enableCvar && *item->enableCvar && item->cvarTest && *item->cvarTest) {
+    if (item->cvarFlags & (CVAR_ENABLE | CVAR_DISABLE) && !Item_EnableShowViaCvar(item, CVAR_ENABLE)) {
+      memcpy(newColor, &parent->disableColor, sizeof(vec4_t));
+    }
+  }
 }
 
 void Item_Text_AutoWrapped_Paint(itemDef_t *item) {
-	char text[1024];
-	const char *p, *textPtr, *newLinePtr;
-	char buff[1024];
-	int width, height, len, textWidth, newLine, newLineWidth;
-	float y;
-	vec4_t color;
-
-	textWidth = 0;
-	newLinePtr = NULL;
-
-	if (item->text == NULL) {
-		if (item->cvar == NULL) {
-			return;
-		}
-		else {
-			DC->getCVarString(item->cvar, text, sizeof(text));
-			textPtr = text;
-		}
-	}
-	else {
-		textPtr = item->text;
-	}
-	if (*textPtr == '\0') {
-		return;
-	}
-	Item_TextColor(item, &color);
-	Item_SetTextExtents(item, &width, &height, textPtr);
-
-	y = item->textaligny;
-	len = 0;
-	buff[0] = '\0';
-	newLine = 0;
-	newLineWidth = 0;
-	p = textPtr;
-	while (p) {
-		if (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\0') {
-			newLine = len;
-			newLinePtr = p+1;
-			newLineWidth = textWidth;
-		}
-		textWidth = DC->textWidth(buff, item->textscale, 0);
-		if ( (newLine && textWidth > item->window.rect.w) || *p == '\n' || *p == '\0') {
-			if (len) {
-				if (item->textalignment == ITEM_ALIGN_LEFT) {
-					item->textRect.x = item->textalignx;
-				} else if (item->textalignment == ITEM_ALIGN_RIGHT) {
-					item->textRect.x = item->textalignx - newLineWidth;
-				} else if (item->textalignment == ITEM_ALIGN_CENTER) {
-					item->textRect.x = item->textalignx - newLineWidth / 2;
-				}
-				item->textRect.y = y;
-				ToWindowCoords(&item->textRect.x, &item->textRect.y, &item->window);
-				//
-				buff[newLine] = '\0';
-				DC->drawText(item->textRect.x, item->textRect.y, item->textscale, color, buff, 0, 0, item->textStyle);
-			}
-			if (*p == '\0') {
-				break;
-			}
-			//
-			y += height + 5;
-			p = newLinePtr;
-			len = 0;
-			newLine = 0;
-			newLineWidth = 0;
-			continue;
-		}
-		buff[len++] = *p++;
-		buff[len] = '\0';
-	}
+  char text[1024];
+  const char *p, *textPtr, *newLinePtr;
+  char buff[1024];
+  int width, height, len, textWidth, newLine, newLineWidth;
+  float y;
+  vec4_t color;
+
+  textWidth = 0;
+  newLinePtr = NULL;
+
+  if (item->text == NULL) {
+    if (item->cvar == NULL) {
+      return;
+    }
+    else {
+      DC->getCVarString(item->cvar, text, sizeof(text));
+      textPtr = text;
+    }
+  }
+  else {
+    textPtr = item->text;
+  }
+  if (*textPtr == '\0') {
+    return;
+  }
+  Item_TextColor(item, &color);
+  Item_SetTextExtents(item, &width, &height, textPtr);
+
+  y = item->textaligny;
+  len = 0;
+  buff[0] = '\0';
+  newLine = 0;
+  newLineWidth = 0;
+  p = textPtr;
+  while (p) {
+    if (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\0') {
+      newLine = len;
+      newLinePtr = p+1;
+      newLineWidth = textWidth;
+    }
+    textWidth = DC->textWidth(buff, item->textscale, 0);
+    if ( (newLine && textWidth > item->window.rect.w) || *p == '\n' || *p == '\0') {
+      if (len) {
+        if (item->textalignment == ITEM_ALIGN_LEFT) {
+          item->textRect.x = item->textalignx;
+        } else if (item->textalignment == ITEM_ALIGN_RIGHT) {
+          item->textRect.x = item->textalignx - newLineWidth;
+        } else if (item->textalignment == ITEM_ALIGN_CENTER) {
+          item->textRect.x = item->textalignx - newLineWidth / 2;
+        }
+        item->textRect.y = y;
+        ToWindowCoords(&item->textRect.x, &item->textRect.y, &item->window);
+        //
+        buff[newLine] = '\0';
+        DC->drawText(item->textRect.x, item->textRect.y, item->textscale, color, buff, 0, 0, item->textStyle);
+      }
+      if (*p == '\0') {
+        break;
+      }
+      //
+      y += height + 5;
+      p = newLinePtr;
+      len = 0;
+      newLine = 0;
+      newLineWidth = 0;
+      continue;
+    }
+    buff[len++] = *p++;
+    buff[len] = '\0';
+  }
 }
 
 void Item_Text_Wrapped_Paint(itemDef_t *item) {
-	char text[1024];
-	const char *p, *start, *textPtr;
-	char buff[1024];
-	int width, height;
-	float x, y;
-	vec4_t color;
-
-	// now paint the text and/or any optional images
-	// default to left
-
-	if (item->text == NULL) {
-		if (item->cvar == NULL) {
-			return;
-		}
-		else {
-			DC->getCVarString(item->cvar, text, sizeof(text));
-			textPtr = text;
-		}
-	}
-	else {
-		textPtr = item->text;
-	}
-	if (*textPtr == '\0') {
-		return;
-	}
-
-	Item_TextColor(item, &color);
-	Item_SetTextExtents(item, &width, &height, textPtr);
-
-	x = item->textRect.x;
-	y = item->textRect.y;
-	start = textPtr;
-	p = strchr(textPtr, '\r');
-	while (p && *p) {
-		strncpy(buff, start, p-start+1);
-		buff[p-start] = '\0';
-		DC->drawText(x, y, item->textscale, color, buff, 0, 0, item->textStyle);
-		y += height + 5;
-		start += p - start + 1;
-		p = strchr(p+1, '\r');
-	}
-	DC->drawText(x, y, item->textscale, color, start, 0, 0, item->textStyle);
+  char text[1024];
+  const char *p, *start, *textPtr;
+  char buff[1024];
+  int width, height;
+  float x, y;
+  vec4_t color;
+
+  // now paint the text and/or any optional images
+  // default to left
+
+  if (item->text == NULL) {
+    if (item->cvar == NULL) {
+      return;
+    }
+    else {
+      DC->getCVarString(item->cvar, text, sizeof(text));
+      textPtr = text;
+    }
+  }
+  else {
+    textPtr = item->text;
+  }
+  if (*textPtr == '\0') {
+    return;
+  }
+
+  Item_TextColor(item, &color);
+  Item_SetTextExtents(item, &width, &height, textPtr);
+
+  x = item->textRect.x;
+  y = item->textRect.y;
+  start = textPtr;
+  p = strchr(textPtr, '\r');
+  while (p && *p) {
+    strncpy(buff, start, p-start+1);
+    buff[p-start] = '\0';
+    DC->drawText(x, y, item->textscale, color, buff, 0, 0, item->textStyle);
+    y += height + 5;
+    start += p - start + 1;
+    p = strchr(p+1, '\r');
+  }
+  DC->drawText(x, y, item->textscale, color, start, 0, 0, item->textStyle);
 }
 
 void Item_Text_Paint(itemDef_t *item) {
-	char text[1024];
-	const char *textPtr;
-	int height, width;
-	vec4_t color;
-
-	if (item->window.flags & WINDOW_WRAPPED) {
-		Item_Text_Wrapped_Paint(item);
-		return;
-	}
-	if (item->window.flags & WINDOW_AUTOWRAPPED) {
-		Item_Text_AutoWrapped_Paint(item);
-		return;
-	}
-
-	if (item->text == NULL) {
-		if (item->cvar == NULL) {
-			return;
-		}
-		else {
-			DC->getCVarString(item->cvar, text, sizeof(text));
-			textPtr = text;
-		}
-	}
-	else {
-		textPtr = item->text;
-	}
-
-	// this needs to go here as it sets extents for cvar types as well
-	Item_SetTextExtents(item, &width, &height, textPtr);
-
-	if (*textPtr == '\0') {
-		return;
-	}
-
-
-	Item_TextColor(item, &color);
-
-	//FIXME: this is a fucking mess
+  char text[1024];
+  const char *textPtr;
+  int height, width;
+  vec4_t color;
+
+  if (item->window.flags & WINDOW_WRAPPED) {
+    Item_Text_Wrapped_Paint(item);
+    return;
+  }
+  if (item->window.flags & WINDOW_AUTOWRAPPED) {
+    Item_Text_AutoWrapped_Paint(item);
+    return;
+  }
+
+  if (item->text == NULL) {
+    if (item->cvar == NULL) {
+      return;
+    }
+    else {
+      DC->getCVarString(item->cvar, text, sizeof(text));
+      textPtr = text;
+    }
+  }
+  else {
+    textPtr = item->text;
+  }
+
+  // this needs to go here as it sets extents for cvar types as well
+  Item_SetTextExtents(item, &width, &height, textPtr);
+
+  if (*textPtr == '\0') {
+    return;
+  }
+
+
+  Item_TextColor(item, &color);
+
+  //FIXME: this is a fucking mess
 /*
-	adjust = 0;
-	if (item->textStyle == ITEM_TEXTSTYLE_OUTLINED || item->textStyle == ITEM_TEXTSTYLE_OUTLINESHADOWED) {
-		adjust = 0.5;
-	}
-
-	if (item->textStyle == ITEM_TEXTSTYLE_SHADOWED || item->textStyle == ITEM_TEXTSTYLE_OUTLINESHADOWED) {
-		Fade(&item->window.flags, &DC->Assets.shadowColor[3], DC->Assets.fadeClamp, &item->window.nextTime, DC->Assets.fadeCycle, qfalse);
-		DC->drawText(item->textRect.x + DC->Assets.shadowX, item->textRect.y + DC->Assets.shadowY, item->textscale, DC->Assets.shadowColor, textPtr, adjust);
-	}
+  adjust = 0;
+  if (item->textStyle == ITEM_TEXTSTYLE_OUTLINED || item->textStyle == ITEM_TEXTSTYLE_OUTLINESHADOWED) {
+    adjust = 0.5;
+  }
+
+  if (item->textStyle == ITEM_TEXTSTYLE_SHADOWED || item->textStyle == ITEM_TEXTSTYLE_OUTLINESHADOWED) {
+    Fade(&item->window.flags, &DC->Assets.shadowColor[3], DC->Assets.fadeClamp, &item->window.nextTime, DC->Assets.fadeCycle, qfalse);
+    DC->drawText(item->textRect.x + DC->Assets.shadowX, item->textRect.y + DC->Assets.shadowY, item->textscale, DC->Assets.shadowColor, textPtr, adjust);
+  }
 */
 
 
-//	if (item->textStyle == ITEM_TEXTSTYLE_OUTLINED || item->textStyle == ITEM_TEXTSTYLE_OUTLINESHADOWED) {
-//		Fade(&item->window.flags, &item->window.outlineColor[3], DC->Assets.fadeClamp, &item->window.nextTime, DC->Assets.fadeCycle, qfalse);
-//		/*
-//		Text_Paint(item->textRect.x-1, item->textRect.y-1, item->textscale, item->window.foreColor, textPtr, adjust);
-//		Text_Paint(item->textRect.x, item->textRect.y-1, item->textscale, item->window.foreColor, textPtr, adjust);
-//		Text_Paint(item->textRect.x+1, item->textRect.y-1, item->textscale, item->window.foreColor, textPtr, adjust);
-//		Text_Paint(item->textRect.x-1, item->textRect.y, item->textscale, item->window.foreColor, textPtr, adjust);
-//		Text_Paint(item->textRect.x+1, item->textRect.y, item->textscale, item->window.foreColor, textPtr, adjust);
-//		Text_Paint(item->textRect.x-1, item->textRect.y+1, item->textscale, item->window.foreColor, textPtr, adjust);
-//		Text_Paint(item->textRect.x, item->textRect.y+1, item->textscale, item->window.foreColor, textPtr, adjust);
-//		Text_Paint(item->textRect.x+1, item->textRect.y+1, item->textscale, item->window.foreColor, textPtr, adjust);
-//		*/
-//		DC->drawText(item->textRect.x - 1, item->textRect.y + 1, item->textscale * 1.02, item->window.outlineColor, textPtr, adjust);
-//	}
+//  if (item->textStyle == ITEM_TEXTSTYLE_OUTLINED || item->textStyle == ITEM_TEXTSTYLE_OUTLINESHADOWED) {
+//    Fade(&item->window.flags, &item->window.outlineColor[3], DC->Assets.fadeClamp, &item->window.nextTime, DC->Assets.fadeCycle, qfalse);
+//    /*
+//    Text_Paint(item->textRect.x-1, item->textRect.y-1, item->textscale, item->window.foreColor, textPtr, adjust);
+//    Text_Paint(item->textRect.x, item->textRect.y-1, item->textscale, item->window.foreColor, textPtr, adjust);
+//    Text_Paint(item->textRect.x+1, item->textRect.y-1, item->textscale, item->window.foreColor, textPtr, adjust);
+//    Text_Paint(item->textRect.x-1, item->textRect.y, item->textscale, item->window.foreColor, textPtr, adjust);
+//    Text_Paint(item->textRect.x+1, item->textRect.y, item->textscale, item->window.foreColor, textPtr, adjust);
+//    Text_Paint(item->textRect.x-1, item->textRect.y+1, item->textscale, item->window.foreColor, textPtr, adjust);
+//    Text_Paint(item->textRect.x, item->textRect.y+1, item->textscale, item->window.foreColor, textPtr, adjust);
+//    Text_Paint(item->textRect.x+1, item->textRect.y+1, item->textscale, item->window.foreColor, textPtr, adjust);
+//    */
+//    DC->drawText(item->textRect.x - 1, item->textRect.y + 1, item->textscale * 1.02, item->window.outlineColor, textPtr, adjust);
+//  }
 
-	DC->drawText(item->textRect.x, item->textRect.y, item->textscale, color, textPtr, 0, 0, item->textStyle);
+  DC->drawText(item->textRect.x, item->textRect.y, item->textscale, color, textPtr, 0, 0, item->textStyle);
 }
 
 
 
-//float			trap_Cvar_VariableValue( const char *var_name );
-//void			trap_Cvar_VariableStringBuffer( const char *var_name, char *buffer, int bufsize );
+//float     trap_Cvar_VariableValue( const char *var_name );
+//void      trap_Cvar_VariableStringBuffer( const char *var_name, char *buffer, int bufsize );
 
 void Item_TextField_Paint(itemDef_t *item) {
-	char buff[1024];
-	vec4_t newColor, lowLight;
-	int offset;
-	menuDef_t *parent = (menuDef_t*)item->parent;
-	editFieldDef_t *editPtr = (editFieldDef_t*)item->typeData;
+  char buff[1024];
+  vec4_t newColor, lowLight;
+  int offset;
+  menuDef_t *parent = (menuDef_t*)item->parent;
+  editFieldDef_t *editPtr = (editFieldDef_t*)item->typeData;
 
-	Item_Text_Paint(item);
+  Item_Text_Paint(item);
 
-	buff[0] = '\0';
+  buff[0] = '\0';
 
-	if (item->cvar) {
-		DC->getCVarString(item->cvar, buff, sizeof(buff));
-	} 
+  if (item->cvar) {
+    DC->getCVarString(item->cvar, buff, sizeof(buff));
+  } 
 
-	parent = (menuDef_t*)item->parent;
+  parent = (menuDef_t*)item->parent;
 
-	if (item->window.flags & WINDOW_HASFOCUS) {
-		lowLight[0] = 0.8 * parent->focusColor[0]; 
-		lowLight[1] = 0.8 * parent->focusColor[1]; 
-		lowLight[2] = 0.8 * parent->focusColor[2]; 
-		lowLight[3] = 0.8 * parent->focusColor[3]; 
-		LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
-	} else {
-		memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
-	}
+  if (item->window.flags & WINDOW_HASFOCUS) {
+    lowLight[0] = 0.8 * parent->focusColor[0]; 
+    lowLight[1] = 0.8 * parent->focusColor[1]; 
+    lowLight[2] = 0.8 * parent->focusColor[2]; 
+    lowLight[3] = 0.8 * parent->focusColor[3]; 
+    LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
+  } else {
+    memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
+  }
 
-	offset = (item->text && *item->text) ? 8 : 0;
-	if (item->window.flags & WINDOW_HASFOCUS && g_editingField) {
-		char cursor = DC->getOverstrikeMode() ? '_' : '|';
-		DC->drawTextWithCursor(item->textRect.x + item->textRect.w + offset, item->textRect.y, item->textscale, newColor, buff + editPtr->paintOffset, item->cursorPos - editPtr->paintOffset , cursor, editPtr->maxPaintChars, item->textStyle);
-	} else {
-		DC->drawText(item->textRect.x + item->textRect.w + offset, item->textRect.y, item->textscale, newColor, buff + editPtr->paintOffset, 0, editPtr->maxPaintChars, item->textStyle);
-	}
+  offset = (item->text && *item->text) ? 8 : 0;
+  if (item->window.flags & WINDOW_HASFOCUS && g_editingField) {
+    char cursor = DC->getOverstrikeMode() ? '_' : '|';
+    DC->drawTextWithCursor(item->textRect.x + item->textRect.w + offset, item->textRect.y, item->textscale, newColor, buff + editPtr->paintOffset, item->cursorPos - editPtr->paintOffset , cursor, editPtr->maxPaintChars, item->textStyle);
+  } else {
+    DC->drawText(item->textRect.x + item->textRect.w + offset, item->textRect.y, item->textscale, newColor, buff + editPtr->paintOffset, 0, editPtr->maxPaintChars, item->textStyle);
+  }
 
 }
 
 void Item_YesNo_Paint(itemDef_t *item) {
-	vec4_t newColor, lowLight;
-	float value;
-	menuDef_t *parent = (menuDef_t*)item->parent;
-
-	value = (item->cvar) ? DC->getCVarValue(item->cvar) : 0;
-
-	if (item->window.flags & WINDOW_HASFOCUS) {
-		lowLight[0] = 0.8 * parent->focusColor[0]; 
-		lowLight[1] = 0.8 * parent->focusColor[1]; 
-		lowLight[2] = 0.8 * parent->focusColor[2]; 
-		lowLight[3] = 0.8 * parent->focusColor[3]; 
-		LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
-	} else {
-		memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
-	}
-
-	if (item->text) {
-		Item_Text_Paint(item);
-		DC->drawText(item->textRect.x + item->textRect.w + 8, item->textRect.y, item->textscale, newColor, (value != 0) ? "Yes" : "No", 0, 0, item->textStyle);
-	} else {
-		DC->drawText(item->textRect.x, item->textRect.y, item->textscale, newColor, (value != 0) ? "Yes" : "No", 0, 0, item->textStyle);
-	}
+  vec4_t newColor, lowLight;
+  float value;
+  menuDef_t *parent = (menuDef_t*)item->parent;
+
+  value = (item->cvar) ? DC->getCVarValue(item->cvar) : 0;
+
+  if (item->window.flags & WINDOW_HASFOCUS) {
+    lowLight[0] = 0.8 * parent->focusColor[0]; 
+    lowLight[1] = 0.8 * parent->focusColor[1]; 
+    lowLight[2] = 0.8 * parent->focusColor[2]; 
+    lowLight[3] = 0.8 * parent->focusColor[3]; 
+    LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
+  } else {
+    memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
+  }
+
+  if (item->text) {
+    Item_Text_Paint(item);
+    DC->drawText(item->textRect.x + item->textRect.w + 8, item->textRect.y, item->textscale, newColor, (value != 0) ? "Yes" : "No", 0, 0, item->textStyle);
+  } else {
+    DC->drawText(item->textRect.x, item->textRect.y, item->textscale, newColor, (value != 0) ? "Yes" : "No", 0, 0, item->textStyle);
+  }
 }
 
 void Item_Multi_Paint(itemDef_t *item) {
-	vec4_t newColor, lowLight;
-	const char *text = "";
-	menuDef_t *parent = (menuDef_t*)item->parent;
+  vec4_t newColor, lowLight;
+  const char *text = "";
+  menuDef_t *parent = (menuDef_t*)item->parent;
 
-	if (item->window.flags & WINDOW_HASFOCUS) {
-		lowLight[0] = 0.8 * parent->focusColor[0]; 
-		lowLight[1] = 0.8 * parent->focusColor[1]; 
-		lowLight[2] = 0.8 * parent->focusColor[2]; 
-		lowLight[3] = 0.8 * parent->focusColor[3]; 
-		LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
-	} else {
-		memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
-	}
+  if (item->window.flags & WINDOW_HASFOCUS) {
+    lowLight[0] = 0.8 * parent->focusColor[0]; 
+    lowLight[1] = 0.8 * parent->focusColor[1]; 
+    lowLight[2] = 0.8 * parent->focusColor[2]; 
+    lowLight[3] = 0.8 * parent->focusColor[3]; 
+    LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
+  } else {
+    memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
+  }
 
-	text = Item_Multi_Setting(item);
+  text = Item_Multi_Setting(item);
 
-	if (item->text) {
-		Item_Text_Paint(item);
-		DC->drawText(item->textRect.x + item->textRect.w + 8, item->textRect.y, item->textscale, newColor, text, 0, 0, item->textStyle);
-	} else {
-		DC->drawText(item->textRect.x, item->textRect.y, item->textscale, newColor, text, 0, 0, item->textStyle);
-	}
+  if (item->text) {
+    Item_Text_Paint(item);
+    DC->drawText(item->textRect.x + item->textRect.w + 8, item->textRect.y, item->textscale, newColor, text, 0, 0, item->textStyle);
+  } else {
+    DC->drawText(item->textRect.x, item->textRect.y, item->textscale, newColor, text, 0, 0, item->textStyle);
+  }
 }
 
 
 typedef struct {
-	char	*command;
-	int		id;
-	int		defaultbind1;
-	int		defaultbind2;
-	int		bind1;
-	int		bind2;
+  char  *command;
+  int   id;
+  int   defaultbind1;
+  int   defaultbind2;
+  int   bind1;
+  int   bind2;
 } bind_t;
 
 typedef struct
 {
-	char*	name;
-	float	defaultvalue;
-	float	value;	
+  char* name;
+  float defaultvalue;
+  float value;  
 } configcvar_t;
 
 
 static bind_t g_bindings[] = 
 {
-	{"+scores",			 K_TAB,				-1,		-1, -1},
-	{"+button2",		 K_ENTER,			-1,		-1, -1},
-	{"+speed", 			 K_SHIFT,			-1,		-1,	-1},
-	{"+forward", 		 K_UPARROW,		-1,		-1, -1},
-	{"+back", 			 K_DOWNARROW,	-1,		-1, -1},
-	{"+moveleft", 	 ',',					-1,		-1, -1},
-	{"+moveright", 	 '.',					-1,		-1, -1},
-	{"+moveup",			 K_SPACE,			-1,		-1, -1},
-	{"+movedown",		 'c',					-1,		-1, -1},
-	{"+left", 			 K_LEFTARROW,	-1,		-1, -1},
-	{"+right", 			 K_RIGHTARROW,	-1,		-1, -1},
-	{"+strafe", 		 K_ALT,				-1,		-1, -1},
-	{"+lookup", 		 K_PGDN,				-1,		-1, -1},
-	{"+lookdown", 	 K_DEL,				-1,		-1, -1},
-	{"+mlook", 			 '/',					-1,		-1, -1},
-	{"centerview", 	 K_END,				-1,		-1, -1},
-	{"+zoom", 			 -1,						-1,		-1, -1},
-	{"weapon 1",		 '1',					-1,		-1, -1},
-	{"weapon 2",		 '2',					-1,		-1, -1},
-	{"weapon 3",		 '3',					-1,		-1, -1},
-	{"weapon 4",		 '4',					-1,		-1, -1},
-	{"weapon 5",		 '5',					-1,		-1, -1},
-	{"weapon 6",		 '6',					-1,		-1, -1},
-	{"weapon 7",		 '7',					-1,		-1, -1},
-	{"weapon 8",		 '8',					-1,		-1, -1},
-	{"weapon 9",		 '9',					-1,		-1, -1},
-	{"weapon 10",		 '0',					-1,		-1, -1},
-	{"weapon 11",		 -1,					-1,		-1, -1},
-	{"weapon 12",		 -1,					-1,		-1, -1},
-	{"weapon 13",		 -1,					-1,		-1, -1},
-	{"+attack", 		 K_MOUSE1,				-1,		-1, -1},
-	{"+button7", 		 K_MOUSE2,				-1,		-1, -1}, //TA: secondary attack
-	{"+button5", 		 'q',				-1,		-1, -1}, //TA: buildable use
-	{"weapprev",		 '[',					-1,		-1, -1},
-	{"weapnext", 		 ']',					-1,		-1, -1},
-	{"+button3", 		 K_MOUSE3,			-1,		-1, -1},
-	{"+button4", 		 K_MOUSE4,			-1,		-1, -1},
-	{"prevTeamMember", 'w',					-1,		-1, -1},
-	{"nextTeamMember", 'r',					-1,		-1, -1},
-	{"nextOrder", 't',					-1,		-1, -1},
-	{"confirmOrder", 'y',					-1,		-1, -1},
-	{"denyOrder", 'n',					-1,		-1, -1},
-	{"taskOffense", 'o',					-1,		-1, -1},
-	{"taskDefense", 'd',					-1,		-1, -1},
-	{"taskPatrol", 'p',					-1,		-1, -1},
-	{"taskCamp", 'c',					-1,		-1, -1},
-	{"taskFollow", 'f',					-1,		-1, -1},
-	{"taskRetrieve", 'v',					-1,		-1, -1},
-	{"taskEscort", 'e',					-1,		-1, -1},
-	{"taskOwnFlag", 'i',					-1,		-1, -1},
-	{"taskSuicide", 'k',					-1,		-1, -1},
-	{"tauntKillInsult", K_F1,			-1,		-1, -1},
-	{"tauntPraise", K_F2,			-1,		-1, -1},
-	{"tauntTaunt", K_F3,			-1,		-1, -1},
-	{"tauntDeathInsult", K_F4,			-1,		-1, -1},
-	{"tauntGauntlet", K_F5,			-1,		-1, -1},
-	{"scoresUp", K_KP_PGUP,			-1,		-1, -1},
-	{"scoresDown", K_KP_PGDN,			-1,		-1, -1},
-	// bk001205 - this one below was:  '-1' 
-	{"messagemode",  -1,					-1,		-1, -1},
-	{"messagemode2", -1,						-1,		-1, -1},
-	{"messagemode3", -1,						-1,		-1, -1},
-	{"messagemode4", -1,						-1,		-1, -1}
+  {"+scores",      K_TAB,       -1,   -1, -1},
+  {"+button2",     K_ENTER,     -1,   -1, -1},
+  {"+speed",       K_SHIFT,     -1,   -1, -1},
+  {"boost",        'x',         -1,   -1, -1}, //TA: human sprinting
+  {"+forward",     K_UPARROW,   -1,   -1, -1},
+  {"+back",        K_DOWNARROW, -1,   -1, -1},
+  {"+moveleft",    ',',         -1,   -1, -1},
+  {"+moveright",   '.',         -1,   -1, -1},
+  {"+moveup",      K_SPACE,     -1,   -1, -1},
+  {"+movedown",    'c',         -1,   -1, -1},
+  {"+left",        K_LEFTARROW, -1,   -1, -1},
+  {"+right",       K_RIGHTARROW,  -1,   -1, -1},
+  {"+strafe",      K_ALT,       -1,   -1, -1},
+  {"+lookup",      K_PGDN,        -1,   -1, -1},
+  {"+lookdown",    K_DEL,       -1,   -1, -1},
+  {"+mlook",       '/',         -1,   -1, -1},
+  {"centerview",   K_END,       -1,   -1, -1},
+  {"+zoom",        -1,            -1,   -1, -1},
+  {"weapon 1",     '1',         -1,   -1, -1},
+  {"weapon 2",     '2',         -1,   -1, -1},
+  {"weapon 3",     '3',         -1,   -1, -1},
+  {"weapon 4",     '4',         -1,   -1, -1},
+  {"weapon 5",     '5',         -1,   -1, -1},
+  {"weapon 6",     '6',         -1,   -1, -1},
+  {"weapon 7",     '7',         -1,   -1, -1},
+  {"weapon 8",     '8',         -1,   -1, -1},
+  {"weapon 9",     '9',         -1,   -1, -1},
+  {"weapon 10",    '0',         -1,   -1, -1},
+  {"weapon 11",    -1,          -1,   -1, -1},
+  {"weapon 12",    -1,          -1,   -1, -1},
+  {"weapon 13",    -1,          -1,   -1, -1},
+  {"+attack",      K_MOUSE1,        -1,   -1, -1},
+  {"+button7",     K_MOUSE2,        -1,   -1, -1}, //TA: secondary attack
+  {"+button5",     'q',       -1,   -1, -1}, //TA: buildable use
+  {"weapprev",     '[',         -1,   -1, -1},
+  {"weapnext",     ']',         -1,   -1, -1},
+  {"+button3",     K_MOUSE3,      -1,   -1, -1},
+  {"+button4",     K_MOUSE4,      -1,   -1, -1},
+  {"prevTeamMember", 'w',         -1,   -1, -1},
+  {"nextTeamMember", 'r',         -1,   -1, -1},
+  {"nextOrder", 't',          -1,   -1, -1},
+  {"confirmOrder", 'y',         -1,   -1, -1},
+  {"denyOrder", 'n',          -1,   -1, -1},
+  {"taskOffense", 'o',          -1,   -1, -1},
+  {"taskDefense", 'd',          -1,   -1, -1},
+  {"taskPatrol", 'p',         -1,   -1, -1},
+  {"taskCamp", 'c',         -1,   -1, -1},
+  {"taskFollow", 'f',         -1,   -1, -1},
+  {"taskRetrieve", 'v',         -1,   -1, -1},
+  {"taskEscort", 'e',         -1,   -1, -1},
+  {"taskOwnFlag", 'i',          -1,   -1, -1},
+  {"taskSuicide", 'k',          -1,   -1, -1},
+  {"tauntKillInsult", K_F1,     -1,   -1, -1},
+  {"tauntPraise", K_F2,     -1,   -1, -1},
+  {"tauntTaunt", K_F3,      -1,   -1, -1},
+  {"tauntDeathInsult", K_F4,      -1,   -1, -1},
+  {"tauntGauntlet", K_F5,     -1,   -1, -1},
+  {"scoresUp", K_KP_PGUP,     -1,   -1, -1},
+  {"scoresDown", K_KP_PGDN,     -1,   -1, -1},
+  // bk001205 - this one below was:  '-1' 
+  {"messagemode",  -1,          -1,   -1, -1},
+  {"messagemode2", -1,            -1,   -1, -1},
+  {"messagemode3", -1,            -1,   -1, -1},
+  {"messagemode4", -1,            -1,   -1, -1}
 };
 
 
@@ -3182,15 +3183,15 @@ static const int g_bindCount = sizeof(g_bindings) / sizeof(bind_t);
 #ifndef MISSIONPACK // bk001206
 static configcvar_t g_configcvars[] =
 {
-	{"cl_run",			0,					0},
-	{"m_pitch",			0,					0},
-	{"cg_autoswitch",	0,					0},
-	{"sensitivity",		0,					0},
-	{"in_joystick",		0,					0},
-	{"joy_threshold",	0,					0},
-	{"m_filter",		0,					0},
-	{"cl_freelook",		0,					0},
-	{NULL,				0,					0}
+  {"cl_run",      0,          0},
+  {"m_pitch",     0,          0},
+  {"cg_autoswitch", 0,          0},
+  {"sensitivity",   0,          0},
+  {"in_joystick",   0,          0},
+  {"joy_threshold", 0,          0},
+  {"m_filter",    0,          0},
+  {"cl_freelook",   0,          0},
+  {NULL,        0,          0}
 };
 #endif
 
@@ -3201,27 +3202,27 @@ Controls_GetKeyAssignment
 */
 static void Controls_GetKeyAssignment (char *command, int *twokeys)
 {
-	int		count;
-	int		j;
-	char	b[256];
-
-	twokeys[0] = twokeys[1] = -1;
-	count = 0;
-
-	for ( j = 0; j < 256; j++ )
-	{
-		DC->getBindingBuf( j, b, 256 );
-		if ( *b == 0 ) {
-			continue;
-		}
-		if ( !Q_stricmp( b, command ) ) {
-			twokeys[count] = j;
-			count++;
-			if (count == 2) {
-				break;
-			}
-		}
-	}
+  int   count;
+  int   j;
+  char  b[256];
+
+  twokeys[0] = twokeys[1] = -1;
+  count = 0;
+
+  for ( j = 0; j < 256; j++ )
+  {
+    DC->getBindingBuf( j, b, 256 );
+    if ( *b == 0 ) {
+      continue;
+    }
+    if ( !Q_stricmp( b, command ) ) {
+      twokeys[count] = j;
+      count++;
+      if (count == 2) {
+        break;
+      }
+    }
+  }
 }
 
 /*
@@ -3231,27 +3232,27 @@ Controls_GetConfig
 */
 void Controls_GetConfig( void )
 {
-	int		i;
-	int		twokeys[2];
+  int   i;
+  int   twokeys[2];
 
-	// iterate each command, get its numeric binding
-	for (i=0; i < g_bindCount; i++)
-	{
+  // iterate each command, get its numeric binding
+  for (i=0; i < g_bindCount; i++)
+  {
 
-		Controls_GetKeyAssignment(g_bindings[i].command, twokeys);
+    Controls_GetKeyAssignment(g_bindings[i].command, twokeys);
 
-		g_bindings[i].bind1 = twokeys[0];
-		g_bindings[i].bind2 = twokeys[1];
-	}
+    g_bindings[i].bind1 = twokeys[0];
+    g_bindings[i].bind2 = twokeys[1];
+  }
 
-	//s_controls.invertmouse.curvalue  = DC->getCVarValue( "m_pitch" ) < 0;
-	//s_controls.smoothmouse.curvalue  = UI_ClampCvar( 0, 1, Controls_GetCvarValue( "m_filter" ) );
-	//s_controls.alwaysrun.curvalue    = UI_ClampCvar( 0, 1, Controls_GetCvarValue( "cl_run" ) );
-	//s_controls.autoswitch.curvalue   = UI_ClampCvar( 0, 1, Controls_GetCvarValue( "cg_autoswitch" ) );
-	//s_controls.sensitivity.curvalue  = UI_ClampCvar( 2, 30, Controls_GetCvarValue( "sensitivity" ) );
-	//s_controls.joyenable.curvalue    = UI_ClampCvar( 0, 1, Controls_GetCvarValue( "in_joystick" ) );
-	//s_controls.joythreshold.curvalue = UI_ClampCvar( 0.05, 0.75, Controls_GetCvarValue( "joy_threshold" ) );
-	//s_controls.freelook.curvalue     = UI_ClampCvar( 0, 1, Controls_GetCvarValue( "cl_freelook" ) );
+  //s_controls.invertmouse.curvalue  = DC->getCVarValue( "m_pitch" ) < 0;
+  //s_controls.smoothmouse.curvalue  = UI_ClampCvar( 0, 1, Controls_GetCvarValue( "m_filter" ) );
+  //s_controls.alwaysrun.curvalue    = UI_ClampCvar( 0, 1, Controls_GetCvarValue( "cl_run" ) );
+  //s_controls.autoswitch.curvalue   = UI_ClampCvar( 0, 1, Controls_GetCvarValue( "cg_autoswitch" ) );
+  //s_controls.sensitivity.curvalue  = UI_ClampCvar( 2, 30, Controls_GetCvarValue( "sensitivity" ) );
+  //s_controls.joyenable.curvalue    = UI_ClampCvar( 0, 1, Controls_GetCvarValue( "in_joystick" ) );
+  //s_controls.joythreshold.curvalue = UI_ClampCvar( 0.05, 0.75, Controls_GetCvarValue( "joy_threshold" ) );
+  //s_controls.freelook.curvalue     = UI_ClampCvar( 0, 1, Controls_GetCvarValue( "cl_freelook" ) );
 }
 
 /*
@@ -3261,35 +3262,35 @@ Controls_SetConfig
 */
 void Controls_SetConfig(qboolean restart)
 {
-	int		i;
+  int   i;
 
-	// iterate each command, get its numeric binding
-	for (i=0; i < g_bindCount; i++)
-	{
+  // iterate each command, get its numeric binding
+  for (i=0; i < g_bindCount; i++)
+  {
 
-		if (g_bindings[i].bind1 != -1)
-		{	
-			DC->setBinding( g_bindings[i].bind1, g_bindings[i].command );
+    if (g_bindings[i].bind1 != -1)
+    { 
+      DC->setBinding( g_bindings[i].bind1, g_bindings[i].command );
 
-			if (g_bindings[i].bind2 != -1)
-				DC->setBinding( g_bindings[i].bind2, g_bindings[i].command );
-		}
-	}
+      if (g_bindings[i].bind2 != -1)
+        DC->setBinding( g_bindings[i].bind2, g_bindings[i].command );
+    }
+  }
 
-	//if ( s_controls.invertmouse.curvalue )
-	//	DC->setCVar("m_pitch", va("%f),-fabs( DC->getCVarValue( "m_pitch" ) ) );
-	//else
-	//	trap_Cvar_SetValue( "m_pitch", fabs( trap_Cvar_VariableValue( "m_pitch" ) ) );
+  //if ( s_controls.invertmouse.curvalue )
+  //  DC->setCVar("m_pitch", va("%f),-fabs( DC->getCVarValue( "m_pitch" ) ) );
+  //else
+  //  trap_Cvar_SetValue( "m_pitch", fabs( trap_Cvar_VariableValue( "m_pitch" ) ) );
 
-	//trap_Cvar_SetValue( "m_filter", s_controls.smoothmouse.curvalue );
-	//trap_Cvar_SetValue( "cl_run", s_controls.alwaysrun.curvalue );
-	//trap_Cvar_SetValue( "cg_autoswitch", s_controls.autoswitch.curvalue );
-	//trap_Cvar_SetValue( "sensitivity", s_controls.sensitivity.curvalue );
-	//trap_Cvar_SetValue( "in_joystick", s_controls.joyenable.curvalue );
-	//trap_Cvar_SetValue( "joy_threshold", s_controls.joythreshold.curvalue );
-	//trap_Cvar_SetValue( "cl_freelook", s_controls.freelook.curvalue );
-	DC->executeText(EXEC_APPEND, "in_restart\n");
-	//trap_Cmd_ExecuteText( EXEC_APPEND, "in_restart\n" );
+  //trap_Cvar_SetValue( "m_filter", s_controls.smoothmouse.curvalue );
+  //trap_Cvar_SetValue( "cl_run", s_controls.alwaysrun.curvalue );
+  //trap_Cvar_SetValue( "cg_autoswitch", s_controls.autoswitch.curvalue );
+  //trap_Cvar_SetValue( "sensitivity", s_controls.sensitivity.curvalue );
+  //trap_Cvar_SetValue( "in_joystick", s_controls.joyenable.curvalue );
+  //trap_Cvar_SetValue( "joy_threshold", s_controls.joythreshold.curvalue );
+  //trap_Cvar_SetValue( "cl_freelook", s_controls.freelook.curvalue );
+  DC->executeText(EXEC_APPEND, "in_restart\n");
+  //trap_Cmd_ExecuteText( EXEC_APPEND, "in_restart\n" );
 }
 
 /*
@@ -3299,545 +3300,545 @@ Controls_SetDefaults
 */
 void Controls_SetDefaults( void )
 {
-	int	i;
+  int i;
 
-	// iterate each command, set its default binding
+  // iterate each command, set its default binding
   for (i=0; i < g_bindCount; i++)
-	{
-		g_bindings[i].bind1 = g_bindings[i].defaultbind1;
-		g_bindings[i].bind2 = g_bindings[i].defaultbind2;
-	}
+  {
+    g_bindings[i].bind1 = g_bindings[i].defaultbind1;
+    g_bindings[i].bind2 = g_bindings[i].defaultbind2;
+  }
 
-	//s_controls.invertmouse.curvalue  = Controls_GetCvarDefault( "m_pitch" ) < 0;
-	//s_controls.smoothmouse.curvalue  = Controls_GetCvarDefault( "m_filter" );
-	//s_controls.alwaysrun.curvalue    = Controls_GetCvarDefault( "cl_run" );
-	//s_controls.autoswitch.curvalue   = Controls_GetCvarDefault( "cg_autoswitch" );
-	//s_controls.sensitivity.curvalue  = Controls_GetCvarDefault( "sensitivity" );
-	//s_controls.joyenable.curvalue    = Controls_GetCvarDefault( "in_joystick" );
-	//s_controls.joythreshold.curvalue = Controls_GetCvarDefault( "joy_threshold" );
-	//s_controls.freelook.curvalue     = Controls_GetCvarDefault( "cl_freelook" );
+  //s_controls.invertmouse.curvalue  = Controls_GetCvarDefault( "m_pitch" ) < 0;
+  //s_controls.smoothmouse.curvalue  = Controls_GetCvarDefault( "m_filter" );
+  //s_controls.alwaysrun.curvalue    = Controls_GetCvarDefault( "cl_run" );
+  //s_controls.autoswitch.curvalue   = Controls_GetCvarDefault( "cg_autoswitch" );
+  //s_controls.sensitivity.curvalue  = Controls_GetCvarDefault( "sensitivity" );
+  //s_controls.joyenable.curvalue    = Controls_GetCvarDefault( "in_joystick" );
+  //s_controls.joythreshold.curvalue = Controls_GetCvarDefault( "joy_threshold" );
+  //s_controls.freelook.curvalue     = Controls_GetCvarDefault( "cl_freelook" );
 }
 
 int BindingIDFromName(const char *name) {
-	int i;
+  int i;
   for (i=0; i < g_bindCount; i++)
-	{
-		if (Q_stricmp(name, g_bindings[i].command) == 0) {
-			return i;
-		}
-	}
-	return -1;
+  {
+    if (Q_stricmp(name, g_bindings[i].command) == 0) {
+      return i;
+    }
+  }
+  return -1;
 }
 
 char g_nameBind1[32];
 char g_nameBind2[32];
 
 void BindingFromName(const char *cvar) {
-	int	i, b1, b2;
-
-	// iterate each command, set its default binding
-	for (i=0; i < g_bindCount; i++)
-	{
-		if (Q_stricmp(cvar, g_bindings[i].command) == 0) {
-			b1 = g_bindings[i].bind1;
-			if (b1 == -1) {
-				break;
-			}
-				DC->keynumToStringBuf( b1, g_nameBind1, 32 );
-				Q_strupr(g_nameBind1);
-
-				b2 = g_bindings[i].bind2;
-				if (b2 != -1)
-				{
-					DC->keynumToStringBuf( b2, g_nameBind2, 32 );
-					Q_strupr(g_nameBind2);
-					strcat( g_nameBind1, " or " );
-					strcat( g_nameBind1, g_nameBind2 );
-				}
-			return;
-		}
-	}
-	strcpy(g_nameBind1, "???");
+  int i, b1, b2;
+
+  // iterate each command, set its default binding
+  for (i=0; i < g_bindCount; i++)
+  {
+    if (Q_stricmp(cvar, g_bindings[i].command) == 0) {
+      b1 = g_bindings[i].bind1;
+      if (b1 == -1) {
+        break;
+      }
+        DC->keynumToStringBuf( b1, g_nameBind1, 32 );
+        Q_strupr(g_nameBind1);
+
+        b2 = g_bindings[i].bind2;
+        if (b2 != -1)
+        {
+          DC->keynumToStringBuf( b2, g_nameBind2, 32 );
+          Q_strupr(g_nameBind2);
+          strcat( g_nameBind1, " or " );
+          strcat( g_nameBind1, g_nameBind2 );
+        }
+      return;
+    }
+  }
+  strcpy(g_nameBind1, "???");
 }
 
 void Item_Slider_Paint(itemDef_t *item) {
-	vec4_t newColor, lowLight;
-	float x, y, value;
-	menuDef_t *parent = (menuDef_t*)item->parent;
+  vec4_t newColor, lowLight;
+  float x, y, value;
+  menuDef_t *parent = (menuDef_t*)item->parent;
 
-	value = (item->cvar) ? DC->getCVarValue(item->cvar) : 0;
+  value = (item->cvar) ? DC->getCVarValue(item->cvar) : 0;
 
-	if (item->window.flags & WINDOW_HASFOCUS) {
-		lowLight[0] = 0.8 * parent->focusColor[0]; 
-		lowLight[1] = 0.8 * parent->focusColor[1]; 
-		lowLight[2] = 0.8 * parent->focusColor[2]; 
-		lowLight[3] = 0.8 * parent->focusColor[3]; 
-		LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
-	} else {
-		memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
-	}
+  if (item->window.flags & WINDOW_HASFOCUS) {
+    lowLight[0] = 0.8 * parent->focusColor[0]; 
+    lowLight[1] = 0.8 * parent->focusColor[1]; 
+    lowLight[2] = 0.8 * parent->focusColor[2]; 
+    lowLight[3] = 0.8 * parent->focusColor[3]; 
+    LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
+  } else {
+    memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
+  }
 
-	y = item->window.rect.y;
-	if (item->text) {
-		Item_Text_Paint(item);
-		x = item->textRect.x + item->textRect.w + 8;
-	} else {
-		x = item->window.rect.x;
-	}
-	DC->setColor(newColor);
-	DC->drawHandlePic( x, y, SLIDER_WIDTH, SLIDER_HEIGHT, DC->Assets.sliderBar );
+  y = item->window.rect.y;
+  if (item->text) {
+    Item_Text_Paint(item);
+    x = item->textRect.x + item->textRect.w + 8;
+  } else {
+    x = item->window.rect.x;
+  }
+  DC->setColor(newColor);
+  DC->drawHandlePic( x, y, SLIDER_WIDTH, SLIDER_HEIGHT, DC->Assets.sliderBar );
 
-	x = Item_Slider_ThumbPosition(item);
-	DC->drawHandlePic( x - (SLIDER_THUMB_WIDTH / 2), y - 2, SLIDER_THUMB_WIDTH, SLIDER_THUMB_HEIGHT, DC->Assets.sliderThumb );
+  x = Item_Slider_ThumbPosition(item);
+  DC->drawHandlePic( x - (SLIDER_THUMB_WIDTH / 2), y - 2, SLIDER_THUMB_WIDTH, SLIDER_THUMB_HEIGHT, DC->Assets.sliderThumb );
 
 }
 
 void Item_Bind_Paint(itemDef_t *item) {
-	vec4_t newColor, lowLight;
-	float value;
-	int maxChars = 0;
-	menuDef_t *parent = (menuDef_t*)item->parent;
-	editFieldDef_t *editPtr = (editFieldDef_t*)item->typeData;
-	if (editPtr) {
-		maxChars = editPtr->maxPaintChars;
-	}
-
-	value = (item->cvar) ? DC->getCVarValue(item->cvar) : 0;
-
-	if (item->window.flags & WINDOW_HASFOCUS) {
-		if (g_bindItem == item) {
-			lowLight[0] = 0.8f * 1.0f;
-			lowLight[1] = 0.8f * 0.0f;
-			lowLight[2] = 0.8f * 0.0f;
-			lowLight[3] = 0.8f * 1.0f;
-		} else {
-			lowLight[0] = 0.8f * parent->focusColor[0]; 
-			lowLight[1] = 0.8f * parent->focusColor[1]; 
-			lowLight[2] = 0.8f * parent->focusColor[2]; 
-			lowLight[3] = 0.8f * parent->focusColor[3]; 
-		}
-		LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
-	} else {
-		memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
-	}
-
-	if (item->text) {
-		Item_Text_Paint(item);
-		BindingFromName(item->cvar);
-		DC->drawText(item->textRect.x + item->textRect.w + 8, item->textRect.y, item->textscale, newColor, g_nameBind1, 0, maxChars, item->textStyle);
-	} else {
-		DC->drawText(item->textRect.x, item->textRect.y, item->textscale, newColor, (value != 0) ? "FIXME" : "FIXME", 0, maxChars, item->textStyle);
-	}
+  vec4_t newColor, lowLight;
+  float value;
+  int maxChars = 0;
+  menuDef_t *parent = (menuDef_t*)item->parent;
+  editFieldDef_t *editPtr = (editFieldDef_t*)item->typeData;
+  if (editPtr) {
+    maxChars = editPtr->maxPaintChars;
+  }
+
+  value = (item->cvar) ? DC->getCVarValue(item->cvar) : 0;
+
+  if (item->window.flags & WINDOW_HASFOCUS) {
+    if (g_bindItem == item) {
+      lowLight[0] = 0.8f * 1.0f;
+      lowLight[1] = 0.8f * 0.0f;
+      lowLight[2] = 0.8f * 0.0f;
+      lowLight[3] = 0.8f * 1.0f;
+    } else {
+      lowLight[0] = 0.8f * parent->focusColor[0]; 
+      lowLight[1] = 0.8f * parent->focusColor[1]; 
+      lowLight[2] = 0.8f * parent->focusColor[2]; 
+      lowLight[3] = 0.8f * parent->focusColor[3]; 
+    }
+    LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
+  } else {
+    memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
+  }
+
+  if (item->text) {
+    Item_Text_Paint(item);
+    BindingFromName(item->cvar);
+    DC->drawText(item->textRect.x + item->textRect.w + 8, item->textRect.y, item->textscale, newColor, g_nameBind1, 0, maxChars, item->textStyle);
+  } else {
+    DC->drawText(item->textRect.x, item->textRect.y, item->textscale, newColor, (value != 0) ? "FIXME" : "FIXME", 0, maxChars, item->textStyle);
+  }
 }
 
 qboolean Display_KeyBindPending() {
-	return g_waitingForKey;
+  return g_waitingForKey;
 }
 
 qboolean Item_Bind_HandleKey(itemDef_t *item, int key, qboolean down) {
-	int			id;
-	int			i;
-
-	if (Rect_ContainsPoint(&item->window.rect, DC->cursorx, DC->cursory) && !g_waitingForKey)
-	{
-		if (down && (key == K_MOUSE1 || key == K_ENTER)) {
-			g_waitingForKey = qtrue;
-			g_bindItem = item;
-		}
-		return qtrue;
-	}
-	else
-	{
-		if (!g_waitingForKey || g_bindItem == NULL) {
-			return qtrue;
-		}
-
-		if (key & K_CHAR_FLAG) {
-			return qtrue;
-		}
-
-		switch (key)
-		{
-			case K_ESCAPE:
-				g_waitingForKey = qfalse;
-				return qtrue;
-	
-			case K_BACKSPACE:
-				id = BindingIDFromName(item->cvar);
-				if (id != -1) {
-					g_bindings[id].bind1 = -1;
-					g_bindings[id].bind2 = -1;
-				}
-				Controls_SetConfig(qtrue);
-				g_waitingForKey = qfalse;
-				g_bindItem = NULL;
-				return qtrue;
-
-			case '`':
-				return qtrue;
-		}
-	}
-
-	if (key != -1)
-	{
-
-		for (i=0; i < g_bindCount; i++)
-		{
-
-			if (g_bindings[i].bind2 == key) {
-				g_bindings[i].bind2 = -1;
-			}
-
-			if (g_bindings[i].bind1 == key)
-			{
-				g_bindings[i].bind1 = g_bindings[i].bind2;
-				g_bindings[i].bind2 = -1;
-			}
-		}
-	}
-
-
-	id = BindingIDFromName(item->cvar);
-
-	if (id != -1) {
-		if (key == -1) {
-			if( g_bindings[id].bind1 != -1 ) {
-				DC->setBinding( g_bindings[id].bind1, "" );
-				g_bindings[id].bind1 = -1;
-			}
-			if( g_bindings[id].bind2 != -1 ) {
-				DC->setBinding( g_bindings[id].bind2, "" );
-				g_bindings[id].bind2 = -1;
-			}
-		}
-		else if (g_bindings[id].bind1 == -1) {
-			g_bindings[id].bind1 = key;
-		}
-		else if (g_bindings[id].bind1 != key && g_bindings[id].bind2 == -1) {
-			g_bindings[id].bind2 = key;
-		}
-		else {
-			DC->setBinding( g_bindings[id].bind1, "" );
-			DC->setBinding( g_bindings[id].bind2, "" );
-			g_bindings[id].bind1 = key;
-			g_bindings[id].bind2 = -1;
-		}						
-	}
-
-	Controls_SetConfig(qtrue);	
-	g_waitingForKey = qfalse;
-
-	return qtrue;
-}
+  int     id;
+  int     i;
+
+  if (Rect_ContainsPoint(&item->window.rect, DC->cursorx, DC->cursory) && !g_waitingForKey)
+  {
+    if (down && (key == K_MOUSE1 || key == K_ENTER)) {
+      g_waitingForKey = qtrue;
+      g_bindItem = item;
+    }
+    return qtrue;
+  }
+  else
+  {
+    if (!g_waitingForKey || g_bindItem == NULL) {
+      return qtrue;
+    }
 
+    if (key & K_CHAR_FLAG) {
+      return qtrue;
+    }
 
+    switch (key)
+    {
+      case K_ESCAPE:
+        g_waitingForKey = qfalse;
+        return qtrue;
+  
+      case K_BACKSPACE:
+        id = BindingIDFromName(item->cvar);
+        if (id != -1) {
+          g_bindings[id].bind1 = -1;
+          g_bindings[id].bind2 = -1;
+        }
+        Controls_SetConfig(qtrue);
+        g_waitingForKey = qfalse;
+        g_bindItem = NULL;
+        return qtrue;
 
-void AdjustFrom640(float *x, float *y, float *w, float *h) {
-	//*x = *x * DC->scale + DC->bias;
-	*x *= DC->xscale;
-	*y *= DC->yscale;
-	*w *= DC->xscale;
-	*h *= DC->yscale;
-}
+      case '`':
+        return qtrue;
+    }
+  }
 
-void Item_Model_Paint(itemDef_t *item) {
-	float x, y, w, h;
-	refdef_t refdef;
-	refEntity_t		ent;
-	vec3_t			mins, maxs, origin;
-	vec3_t			angles;
-	modelDef_t *modelPtr = (modelDef_t*)item->typeData;
+  if (key != -1)
+  {
 
-	if (modelPtr == NULL) {
-		return;
-	}
+    for (i=0; i < g_bindCount; i++)
+    {
 
-	// setup the refdef
-	memset( &refdef, 0, sizeof( refdef ) );
-	refdef.rdflags = RDF_NOWORLDMODEL;
-	AxisClear( refdef.viewaxis );
-	x = item->window.rect.x+1;
-	y = item->window.rect.y+1;
-	w = item->window.rect.w-2;
-	h = item->window.rect.h-2;
+      if (g_bindings[i].bind2 == key) {
+        g_bindings[i].bind2 = -1;
+      }
 
-	AdjustFrom640( &x, &y, &w, &h );
+      if (g_bindings[i].bind1 == key)
+      {
+        g_bindings[i].bind1 = g_bindings[i].bind2;
+        g_bindings[i].bind2 = -1;
+      }
+    }
+  }
 
-	refdef.x = x;
-	refdef.y = y;
-	refdef.width = w;
-	refdef.height = h;
 
-	DC->modelBounds( item->asset, mins, maxs );
+  id = BindingIDFromName(item->cvar);
 
-	origin[2] = -0.5 * ( mins[2] + maxs[2] );
-	origin[1] = 0.5 * ( mins[1] + maxs[1] );
+  if (id != -1) {
+    if (key == -1) {
+      if( g_bindings[id].bind1 != -1 ) {
+        DC->setBinding( g_bindings[id].bind1, "" );
+        g_bindings[id].bind1 = -1;
+      }
+      if( g_bindings[id].bind2 != -1 ) {
+        DC->setBinding( g_bindings[id].bind2, "" );
+        g_bindings[id].bind2 = -1;
+      }
+    }
+    else if (g_bindings[id].bind1 == -1) {
+      g_bindings[id].bind1 = key;
+    }
+    else if (g_bindings[id].bind1 != key && g_bindings[id].bind2 == -1) {
+      g_bindings[id].bind2 = key;
+    }
+    else {
+      DC->setBinding( g_bindings[id].bind1, "" );
+      DC->setBinding( g_bindings[id].bind2, "" );
+      g_bindings[id].bind1 = key;
+      g_bindings[id].bind2 = -1;
+    }           
+  }
 
-	// calculate distance so the model nearly fills the box
-	if (qtrue) {
-		float len = 0.5 * ( maxs[2] - mins[2] );		
-		origin[0] = len / 0.268;	// len / tan( fov/2 )
-		//origin[0] = len / tan(w/2);
-	} else {
-		origin[0] = item->textscale;
-	}
-	refdef.fov_x = (modelPtr->fov_x) ? modelPtr->fov_x : w;
-	refdef.fov_y = (modelPtr->fov_y) ? modelPtr->fov_y : h;
+  Controls_SetConfig(qtrue);  
+  g_waitingForKey = qfalse;
 
-	//refdef.fov_x = (int)((float)refdef.width / 640.0f * 90.0f);
-	//xx = refdef.width / tan( refdef.fov_x / 360 * M_PI );
-	//refdef.fov_y = atan2( refdef.height, xx );
-	//refdef.fov_y *= ( 360 / M_PI );
+  return qtrue;
+}
 
-	DC->clearScene();
 
-	refdef.time = DC->realTime;
 
-	// add the model
+void AdjustFrom640(float *x, float *y, float *w, float *h) {
+  //*x = *x * DC->scale + DC->bias;
+  *x *= DC->xscale;
+  *y *= DC->yscale;
+  *w *= DC->xscale;
+  *h *= DC->yscale;
+}
 
-	memset( &ent, 0, sizeof(ent) );
+void Item_Model_Paint(itemDef_t *item) {
+  float x, y, w, h;
+  refdef_t refdef;
+  refEntity_t   ent;
+  vec3_t      mins, maxs, origin;
+  vec3_t      angles;
+  modelDef_t *modelPtr = (modelDef_t*)item->typeData;
+
+  if (modelPtr == NULL) {
+    return;
+  }
+
+  // setup the refdef
+  memset( &refdef, 0, sizeof( refdef ) );
+  refdef.rdflags = RDF_NOWORLDMODEL;
+  AxisClear( refdef.viewaxis );
+  x = item->window.rect.x+1;
+  y = item->window.rect.y+1;
+  w = item->window.rect.w-2;
+  h = item->window.rect.h-2;
+
+  AdjustFrom640( &x, &y, &w, &h );
+
+  refdef.x = x;
+  refdef.y = y;
+  refdef.width = w;
+  refdef.height = h;
+
+  DC->modelBounds( item->asset, mins, maxs );
+
+  origin[2] = -0.5 * ( mins[2] + maxs[2] );
+  origin[1] = 0.5 * ( mins[1] + maxs[1] );
+
+  // calculate distance so the model nearly fills the box
+  if (qtrue) {
+    float len = 0.5 * ( maxs[2] - mins[2] );    
+    origin[0] = len / 0.268;  // len / tan( fov/2 )
+    //origin[0] = len / tan(w/2);
+  } else {
+    origin[0] = item->textscale;
+  }
+  refdef.fov_x = (modelPtr->fov_x) ? modelPtr->fov_x : w;
+  refdef.fov_y = (modelPtr->fov_y) ? modelPtr->fov_y : h;
+
+  //refdef.fov_x = (int)((float)refdef.width / 640.0f * 90.0f);
+  //xx = refdef.width / tan( refdef.fov_x / 360 * M_PI );
+  //refdef.fov_y = atan2( refdef.height, xx );
+  //refdef.fov_y *= ( 360 / M_PI );
+
+  DC->clearScene();
+
+  refdef.time = DC->realTime;
+
+  // add the model
 
-	//adjust = 5.0 * sin( (float)uis.realtime / 500 );
-	//adjust = 360 % (int)((float)uis.realtime / 1000);
-	//VectorSet( angles, 0, 0, 1 );
+  memset( &ent, 0, sizeof(ent) );
 
-	// use item storage to track
-	if (modelPtr->rotationSpeed) {
-		if (DC->realTime > item->window.nextTime) {
-			item->window.nextTime = DC->realTime + modelPtr->rotationSpeed;
-			modelPtr->angle = (int)(modelPtr->angle + 1) % 360;
-		}
-	}
-	VectorSet( angles, 0, modelPtr->angle, 0 );
-	AnglesToAxis( angles, ent.axis );
+  //adjust = 5.0 * sin( (float)uis.realtime / 500 );
+  //adjust = 360 % (int)((float)uis.realtime / 1000);
+  //VectorSet( angles, 0, 0, 1 );
 
-	ent.hModel = item->asset;
-	VectorCopy( origin, ent.origin );
-	VectorCopy( origin, ent.lightingOrigin );
-	ent.renderfx = RF_LIGHTING_ORIGIN | RF_NOSHADOW;
-	VectorCopy( ent.origin, ent.oldorigin );
+  // use item storage to track
+  if (modelPtr->rotationSpeed) {
+    if (DC->realTime > item->window.nextTime) {
+      item->window.nextTime = DC->realTime + modelPtr->rotationSpeed;
+      modelPtr->angle = (int)(modelPtr->angle + 1) % 360;
+    }
+  }
+  VectorSet( angles, 0, modelPtr->angle, 0 );
+  AnglesToAxis( angles, ent.axis );
+
+  ent.hModel = item->asset;
+  VectorCopy( origin, ent.origin );
+  VectorCopy( origin, ent.lightingOrigin );
+  ent.renderfx = RF_LIGHTING_ORIGIN | RF_NOSHADOW;
+  VectorCopy( ent.origin, ent.oldorigin );
 
-	DC->addRefEntityToScene( &ent );
-	DC->renderScene( &refdef );
+  DC->addRefEntityToScene( &ent );
+  DC->renderScene( &refdef );
 
 }
 
 
 void Item_Image_Paint(itemDef_t *item) {
-	if (item == NULL) {
-		return;
-	}
-	DC->drawHandlePic(item->window.rect.x+1, item->window.rect.y+1, item->window.rect.w-2, item->window.rect.h-2, item->asset);
+  if (item == NULL) {
+    return;
+  }
+  DC->drawHandlePic(item->window.rect.x+1, item->window.rect.y+1, item->window.rect.w-2, item->window.rect.h-2, item->asset);
 }
 
 void Item_ListBox_Paint(itemDef_t *item) {
-	float x, y, size, count, i, thumb;
-	qhandle_t image;
-	qhandle_t optionalImage;
-	listBoxDef_t *listPtr = (listBoxDef_t*)item->typeData;
-
-	// the listbox is horizontal or vertical and has a fixed size scroll bar going either direction
-	// elements are enumerated from the DC and either text or image handles are acquired from the DC as well
-	// textscale is used to size the text, textalignx and textaligny are used to size image elements
-	// there is no clipping available so only the last completely visible item is painted
-	count = DC->feederCount(item->special);
-	// default is vertical if horizontal flag is not here
-	if (item->window.flags & WINDOW_HORIZONTAL) {
-		// draw scrollbar in bottom of the window
-		// bar
-		x = item->window.rect.x + 1;
-		y = item->window.rect.y + item->window.rect.h - SCROLLBAR_SIZE - 1;
-		DC->drawHandlePic(x, y, SCROLLBAR_SIZE, SCROLLBAR_SIZE, DC->Assets.scrollBarArrowLeft);
-		x += SCROLLBAR_SIZE - 1;
-		size = item->window.rect.w - (SCROLLBAR_SIZE * 2);
-		DC->drawHandlePic(x, y, size+1, SCROLLBAR_SIZE, DC->Assets.scrollBar);
-		x += size - 1;
-		DC->drawHandlePic(x, y, SCROLLBAR_SIZE, SCROLLBAR_SIZE, DC->Assets.scrollBarArrowRight);
-		// thumb
-		thumb = Item_ListBox_ThumbDrawPosition(item);//Item_ListBox_ThumbPosition(item);
-		if (thumb > x - SCROLLBAR_SIZE - 1) {
-			thumb = x - SCROLLBAR_SIZE - 1;
-		}
-		DC->drawHandlePic(thumb, y, SCROLLBAR_SIZE, SCROLLBAR_SIZE, DC->Assets.scrollBarThumb);
-		//
-		listPtr->endPos = listPtr->startPos;
-		size = item->window.rect.w - 2;
-		// items
-		// size contains max available space
-		if (listPtr->elementStyle == LISTBOX_IMAGE) {
-			// fit = 0;
-			x = item->window.rect.x + 1;
-			y = item->window.rect.y + 1;
-			for (i = listPtr->startPos; i < count; i++) {
-				// always draw at least one
-				// which may overdraw the box if it is too small for the element
-				image = DC->feederItemImage(item->special, i);
-				if (image) {
-					DC->drawHandlePic(x+1, y+1, listPtr->elementWidth - 2, listPtr->elementHeight - 2, image);
-				}
-
-				if (i == item->cursorPos) {
-					DC->drawRect(x, y, listPtr->elementWidth-1, listPtr->elementHeight-1, item->window.borderSize, item->window.borderColor);
-				}
-
-				size -= listPtr->elementWidth;
-				if (size < listPtr->elementWidth) {
-					listPtr->drawPadding = size; //listPtr->elementWidth - size;
-					break;
-				}
-				x += listPtr->elementWidth;
-				listPtr->endPos++;
-				// fit++;
-			}
-		} else {
-			//
-		}
-	} else {
-		// draw scrollbar to right side of the window
-		x = item->window.rect.x + item->window.rect.w - SCROLLBAR_SIZE - 1;
-		y = item->window.rect.y + 1;
-		DC->drawHandlePic(x, y, SCROLLBAR_SIZE, SCROLLBAR_SIZE, DC->Assets.scrollBarArrowUp);
-		y += SCROLLBAR_SIZE - 1;
-
-		listPtr->endPos = listPtr->startPos;
-		size = item->window.rect.h - (SCROLLBAR_SIZE * 2);
-		DC->drawHandlePic(x, y, SCROLLBAR_SIZE, size+1, DC->Assets.scrollBar);
-		y += size - 1;
-		DC->drawHandlePic(x, y, SCROLLBAR_SIZE, SCROLLBAR_SIZE, DC->Assets.scrollBarArrowDown);
-		// thumb
-		thumb = Item_ListBox_ThumbDrawPosition(item);//Item_ListBox_ThumbPosition(item);
-		if (thumb > y - SCROLLBAR_SIZE - 1) {
-			thumb = y - SCROLLBAR_SIZE - 1;
-		}
-		DC->drawHandlePic(x, thumb, SCROLLBAR_SIZE, SCROLLBAR_SIZE, DC->Assets.scrollBarThumb);
-
-		// adjust size for item painting
-		size = item->window.rect.h - 2;
-		if (listPtr->elementStyle == LISTBOX_IMAGE) {
-			// fit = 0;
-			x = item->window.rect.x + 1;
-			y = item->window.rect.y + 1;
-			for (i = listPtr->startPos; i < count; i++) {
-				// always draw at least one
-				// which may overdraw the box if it is too small for the element
-				image = DC->feederItemImage(item->special, i);
-				if (image) {
-					DC->drawHandlePic(x+1, y+1, listPtr->elementWidth - 2, listPtr->elementHeight - 2, image);
-				}
-
-				if (i == item->cursorPos) {
-					DC->drawRect(x, y, listPtr->elementWidth - 1, listPtr->elementHeight - 1, item->window.borderSize, item->window.borderColor);
-				}
-
-				listPtr->endPos++;
-				size -= listPtr->elementWidth;
-				if (size < listPtr->elementHeight) {
-					listPtr->drawPadding = listPtr->elementHeight - size;
-					break;
-				}
-				y += listPtr->elementHeight;
-				// fit++;
-			}
-		} else {
-			x = item->window.rect.x + 1;
-			y = item->window.rect.y + 1;
-			for (i = listPtr->startPos; i < count; i++) {
-				const char *text;
-				// always draw at least one
-				// which may overdraw the box if it is too small for the element
-
-				if (listPtr->numColumns > 0) {
-					int j;
-					for (j = 0; j < listPtr->numColumns; j++) {
-						text = DC->feederItemText(item->special, i, j, &optionalImage);
-						if (optionalImage >= 0) {
-							DC->drawHandlePic(x + 4 + listPtr->columnInfo[j].pos, y - 1 + listPtr->elementHeight / 2, listPtr->columnInfo[j].width, listPtr->columnInfo[j].width, optionalImage);
-						} else if (text) {
-							DC->drawText(x + 4 + listPtr->columnInfo[j].pos, y + listPtr->elementHeight, item->textscale, item->window.foreColor, text, 0, listPtr->columnInfo[j].maxChars, item->textStyle);
-						}
-					}
-				} else {
-					text = DC->feederItemText(item->special, i, 0, &optionalImage);
-					if (optionalImage >= 0) {
-						//DC->drawHandlePic(x + 4 + listPtr->elementHeight, y, listPtr->columnInfo[j].width, listPtr->columnInfo[j].width, optionalImage);
-					} else if (text) {
-						DC->drawText(x + 4, y + listPtr->elementHeight, item->textscale, item->window.foreColor, text, 0, 0, item->textStyle);
-					}
-				}
-
-				if (i == item->cursorPos) {
-					DC->fillRect(x + 2, y + 2, item->window.rect.w - SCROLLBAR_SIZE - 4, listPtr->elementHeight, item->window.outlineColor);
-				}
-
-				size -= listPtr->elementHeight;
-				if (size < listPtr->elementHeight) {
-					listPtr->drawPadding = listPtr->elementHeight - size;
-					break;
-				}
-				listPtr->endPos++;
-				y += listPtr->elementHeight;
-				// fit++;
-			}
-		}
-	}
+  float x, y, size, count, i, thumb;
+  qhandle_t image;
+  qhandle_t optionalImage;
+  listBoxDef_t *listPtr = (listBoxDef_t*)item->typeData;
+
+  // the listbox is horizontal or vertical and has a fixed size scroll bar going either direction
+  // elements are enumerated from the DC and either text or image handles are acquired from the DC as well
+  // textscale is used to size the text, textalignx and textaligny are used to size image elements
+  // there is no clipping available so only the last completely visible item is painted
+  count = DC->feederCount(item->special);
+  // default is vertical if horizontal flag is not here
+  if (item->window.flags & WINDOW_HORIZONTAL) {
+    // draw scrollbar in bottom of the window
+    // bar
+    x = item->window.rect.x + 1;
+    y = item->window.rect.y + item->window.rect.h - SCROLLBAR_SIZE - 1;
+    DC->drawHandlePic(x, y, SCROLLBAR_SIZE, SCROLLBAR_SIZE, DC->Assets.scrollBarArrowLeft);
+    x += SCROLLBAR_SIZE - 1;
+    size = item->window.rect.w - (SCROLLBAR_SIZE * 2);
+    DC->drawHandlePic(x, y, size+1, SCROLLBAR_SIZE, DC->Assets.scrollBar);
+    x += size - 1;
+    DC->drawHandlePic(x, y, SCROLLBAR_SIZE, SCROLLBAR_SIZE, DC->Assets.scrollBarArrowRight);
+    // thumb
+    thumb = Item_ListBox_ThumbDrawPosition(item);//Item_ListBox_ThumbPosition(item);
+    if (thumb > x - SCROLLBAR_SIZE - 1) {
+      thumb = x - SCROLLBAR_SIZE - 1;
+    }
+    DC->drawHandlePic(thumb, y, SCROLLBAR_SIZE, SCROLLBAR_SIZE, DC->Assets.scrollBarThumb);
+    //
+    listPtr->endPos = listPtr->startPos;
+    size = item->window.rect.w - 2;
+    // items
+    // size contains max available space
+    if (listPtr->elementStyle == LISTBOX_IMAGE) {
+      // fit = 0;
+      x = item->window.rect.x + 1;
+      y = item->window.rect.y + 1;
+      for (i = listPtr->startPos; i < count; i++) {
+        // always draw at least one
+        // which may overdraw the box if it is too small for the element
+        image = DC->feederItemImage(item->special, i);
+        if (image) {
+          DC->drawHandlePic(x+1, y+1, listPtr->elementWidth - 2, listPtr->elementHeight - 2, image);
+        }
+
+        if (i == item->cursorPos) {
+          DC->drawRect(x, y, listPtr->elementWidth-1, listPtr->elementHeight-1, item->window.borderSize, item->window.borderColor);
+        }
+
+        size -= listPtr->elementWidth;
+        if (size < listPtr->elementWidth) {
+          listPtr->drawPadding = size; //listPtr->elementWidth - size;
+          break;
+        }
+        x += listPtr->elementWidth;
+        listPtr->endPos++;
+        // fit++;
+      }
+    } else {
+      //
+    }
+  } else {
+    // draw scrollbar to right side of the window
+    x = item->window.rect.x + item->window.rect.w - SCROLLBAR_SIZE - 1;
+    y = item->window.rect.y + 1;
+    DC->drawHandlePic(x, y, SCROLLBAR_SIZE, SCROLLBAR_SIZE, DC->Assets.scrollBarArrowUp);
+    y += SCROLLBAR_SIZE - 1;
+
+    listPtr->endPos = listPtr->startPos;
+    size = item->window.rect.h - (SCROLLBAR_SIZE * 2);
+    DC->drawHandlePic(x, y, SCROLLBAR_SIZE, size+1, DC->Assets.scrollBar);
+    y += size - 1;
+    DC->drawHandlePic(x, y, SCROLLBAR_SIZE, SCROLLBAR_SIZE, DC->Assets.scrollBarArrowDown);
+    // thumb
+    thumb = Item_ListBox_ThumbDrawPosition(item);//Item_ListBox_ThumbPosition(item);
+    if (thumb > y - SCROLLBAR_SIZE - 1) {
+      thumb = y - SCROLLBAR_SIZE - 1;
+    }
+    DC->drawHandlePic(x, thumb, SCROLLBAR_SIZE, SCROLLBAR_SIZE, DC->Assets.scrollBarThumb);
+
+    // adjust size for item painting
+    size = item->window.rect.h - 2;
+    if (listPtr->elementStyle == LISTBOX_IMAGE) {
+      // fit = 0;
+      x = item->window.rect.x + 1;
+      y = item->window.rect.y + 1;
+      for (i = listPtr->startPos; i < count; i++) {
+        // always draw at least one
+        // which may overdraw the box if it is too small for the element
+        image = DC->feederItemImage(item->special, i);
+        if (image) {
+          DC->drawHandlePic(x+1, y+1, listPtr->elementWidth - 2, listPtr->elementHeight - 2, image);
+        }
+
+        if (i == item->cursorPos) {
+          DC->drawRect(x, y, listPtr->elementWidth - 1, listPtr->elementHeight - 1, item->window.borderSize, item->window.borderColor);
+        }
+
+        listPtr->endPos++;
+        size -= listPtr->elementWidth;
+        if (size < listPtr->elementHeight) {
+          listPtr->drawPadding = listPtr->elementHeight - size;
+          break;
+        }
+        y += listPtr->elementHeight;
+        // fit++;
+      }
+    } else {
+      x = item->window.rect.x + 1;
+      y = item->window.rect.y + 1;
+      for (i = listPtr->startPos; i < count; i++) {
+        const char *text;
+        // always draw at least one
+        // which may overdraw the box if it is too small for the element
+
+        if (listPtr->numColumns > 0) {
+          int j;
+          for (j = 0; j < listPtr->numColumns; j++) {
+            text = DC->feederItemText(item->special, i, j, &optionalImage);
+            if (optionalImage >= 0) {
+              DC->drawHandlePic(x + 4 + listPtr->columnInfo[j].pos, y - 1 + listPtr->elementHeight / 2, listPtr->columnInfo[j].width, listPtr->columnInfo[j].width, optionalImage);
+            } else if (text) {
+              DC->drawText(x + 4 + listPtr->columnInfo[j].pos, y + listPtr->elementHeight, item->textscale, item->window.foreColor, text, 0, listPtr->columnInfo[j].maxChars, item->textStyle);
+            }
+          }
+        } else {
+          text = DC->feederItemText(item->special, i, 0, &optionalImage);
+          if (optionalImage >= 0) {
+            //DC->drawHandlePic(x + 4 + listPtr->elementHeight, y, listPtr->columnInfo[j].width, listPtr->columnInfo[j].width, optionalImage);
+          } else if (text) {
+            DC->drawText(x + 4, y + listPtr->elementHeight, item->textscale, item->window.foreColor, text, 0, 0, item->textStyle);
+          }
+        }
+
+        if (i == item->cursorPos) {
+          DC->fillRect(x + 2, y + 2, item->window.rect.w - SCROLLBAR_SIZE - 4, listPtr->elementHeight, item->window.outlineColor);
+        }
+
+        size -= listPtr->elementHeight;
+        if (size < listPtr->elementHeight) {
+          listPtr->drawPadding = listPtr->elementHeight - size;
+          break;
+        }
+        listPtr->endPos++;
+        y += listPtr->elementHeight;
+        // fit++;
+      }
+    }
+  }
 }
 
 
 void Item_OwnerDraw_Paint(itemDef_t *item) {
   menuDef_t *parent;
 
-	if (item == NULL) {
-		return;
-	}
+  if (item == NULL) {
+    return;
+  }
   parent = (menuDef_t*)item->parent;
 
-	if (DC->ownerDrawItem) {
-		vec4_t color, lowLight;
-		menuDef_t *parent = (menuDef_t*)item->parent;
-		Fade(&item->window.flags, &item->window.foreColor[3], parent->fadeClamp, &item->window.nextTime, parent->fadeCycle, qtrue, parent->fadeAmount);
-		memcpy(&color, &item->window.foreColor, sizeof(color));
-		if (item->numColors > 0 && DC->getValue) {
-			// if the value is within one of the ranges then set color to that, otherwise leave at default
-			int i;
-			float f = DC->getValue(item->window.ownerDraw);
-			for (i = 0; i < item->numColors; i++) {
-				if (f >= item->colorRanges[i].low && f <= item->colorRanges[i].high) {
-					memcpy(&color, &item->colorRanges[i].color, sizeof(color));
-					break;
-				}
-			}
-		}
-
-		if (item->window.flags & WINDOW_HASFOCUS) {
-			lowLight[0] = 0.8 * parent->focusColor[0]; 
-			lowLight[1] = 0.8 * parent->focusColor[1]; 
-			lowLight[2] = 0.8 * parent->focusColor[2]; 
-			lowLight[3] = 0.8 * parent->focusColor[3]; 
-			LerpColor(parent->focusColor,lowLight,color,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
-		} else if (item->textStyle == ITEM_TEXTSTYLE_BLINK && !((DC->realTime/BLINK_DIVISOR) & 1)) {
-			lowLight[0] = 0.8 * item->window.foreColor[0]; 
-			lowLight[1] = 0.8 * item->window.foreColor[1]; 
-			lowLight[2] = 0.8 * item->window.foreColor[2]; 
-			lowLight[3] = 0.8 * item->window.foreColor[3]; 
-			LerpColor(item->window.foreColor,lowLight,color,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
-		}
-
-		if (item->cvarFlags & (CVAR_ENABLE | CVAR_DISABLE) && !Item_EnableShowViaCvar(item, CVAR_ENABLE)) {
-		  memcpy(color, parent->disableColor, sizeof(vec4_t)); // bk001207 - FIXME: Com_Memcpy
-		}
-	
-		if (item->text) {
-			Item_Text_Paint(item);
-				if (item->text[0]) {
-					// +8 is an offset kludge to properly align owner draw items that have text combined with them
-					DC->ownerDrawItem(item->textRect.x + item->textRect.w + 8, item->window.rect.y, item->window.rect.w, item->window.rect.h, 0, item->textaligny, item->window.ownerDraw, item->window.ownerDrawFlags, item->alignment, item->special, item->textscale, color, item->window.background, item->textStyle );
-				} else {
-					DC->ownerDrawItem(item->textRect.x + item->textRect.w, item->window.rect.y, item->window.rect.w, item->window.rect.h, 0, item->textaligny, item->window.ownerDraw, item->window.ownerDrawFlags, item->alignment, item->special, item->textscale, color, item->window.background, item->textStyle );
-				}
-			} else {
-			DC->ownerDrawItem(item->window.rect.x, item->window.rect.y, item->window.rect.w, item->window.rect.h, item->textalignx, item->textaligny, item->window.ownerDraw, item->window.ownerDrawFlags, item->alignment, item->special, item->textscale, color, item->window.background, item->textStyle );
-		}
-	}
+  if (DC->ownerDrawItem) {
+    vec4_t color, lowLight;
+    menuDef_t *parent = (menuDef_t*)item->parent;
+    Fade(&item->window.flags, &item->window.foreColor[3], parent->fadeClamp, &item->window.nextTime, parent->fadeCycle, qtrue, parent->fadeAmount);
+    memcpy(&color, &item->window.foreColor, sizeof(color));
+    if (item->numColors > 0 && DC->getValue) {
+      // if the value is within one of the ranges then set color to that, otherwise leave at default
+      int i;
+      float f = DC->getValue(item->window.ownerDraw);
+      for (i = 0; i < item->numColors; i++) {
+        if (f >= item->colorRanges[i].low && f <= item->colorRanges[i].high) {
+          memcpy(&color, &item->colorRanges[i].color, sizeof(color));
+          break;
+        }
+      }
+    }
+
+    if (item->window.flags & WINDOW_HASFOCUS) {
+      lowLight[0] = 0.8 * parent->focusColor[0]; 
+      lowLight[1] = 0.8 * parent->focusColor[1]; 
+      lowLight[2] = 0.8 * parent->focusColor[2]; 
+      lowLight[3] = 0.8 * parent->focusColor[3]; 
+      LerpColor(parent->focusColor,lowLight,color,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
+    } else if (item->textStyle == ITEM_TEXTSTYLE_BLINK && !((DC->realTime/BLINK_DIVISOR) & 1)) {
+      lowLight[0] = 0.8 * item->window.foreColor[0]; 
+      lowLight[1] = 0.8 * item->window.foreColor[1]; 
+      lowLight[2] = 0.8 * item->window.foreColor[2]; 
+      lowLight[3] = 0.8 * item->window.foreColor[3]; 
+      LerpColor(item->window.foreColor,lowLight,color,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
+    }
+
+    if (item->cvarFlags & (CVAR_ENABLE | CVAR_DISABLE) && !Item_EnableShowViaCvar(item, CVAR_ENABLE)) {
+      memcpy(color, parent->disableColor, sizeof(vec4_t)); // bk001207 - FIXME: Com_Memcpy
+    }
+  
+    if (item->text) {
+      Item_Text_Paint(item);
+        if (item->text[0]) {
+          // +8 is an offset kludge to properly align owner draw items that have text combined with them
+          DC->ownerDrawItem(item->textRect.x + item->textRect.w + 8, item->window.rect.y, item->window.rect.w, item->window.rect.h, 0, item->textaligny, item->window.ownerDraw, item->window.ownerDrawFlags, item->alignment, item->special, item->textscale, color, item->window.background, item->textStyle );
+        } else {
+          DC->ownerDrawItem(item->textRect.x + item->textRect.w, item->window.rect.y, item->window.rect.w, item->window.rect.h, 0, item->textaligny, item->window.ownerDraw, item->window.ownerDrawFlags, item->alignment, item->special, item->textscale, color, item->window.background, item->textStyle );
+        }
+      } else {
+      DC->ownerDrawItem(item->window.rect.x, item->window.rect.y, item->window.rect.w, item->window.rect.h, item->textalignx, item->textaligny, item->window.ownerDraw, item->window.ownerDrawFlags, item->alignment, item->special, item->textscale, color, item->window.background, item->textStyle );
+    }
+  }
 }
 
 
@@ -3862,7 +3863,7 @@ void Item_Paint(itemDef_t *item) {
       rx = item->window.rectClient.x + w - item->window.rectEffects.x;
       ry = item->window.rectClient.y + h - item->window.rectEffects.y;
       a = 3 * M_PI / 180;
-  	  c = cos(a);
+      c = cos(a);
       s = sin(a);
       item->window.rectClient.x = (rx * c - ry * s) + item->window.rectEffects.x - w;
       item->window.rectClient.y = (rx * s + ry * c) + item->window.rectEffects.y - h;
@@ -3876,75 +3877,75 @@ void Item_Paint(itemDef_t *item) {
     if (DC->realTime > item->window.nextTime) {
       int done = 0;
       item->window.nextTime = DC->realTime + item->window.offsetTime;
-			// transition the x,y
-			if (item->window.rectClient.x == item->window.rectEffects.x) {
-				done++;
-			} else {
-				if (item->window.rectClient.x < item->window.rectEffects.x) {
-					item->window.rectClient.x += item->window.rectEffects2.x;
-					if (item->window.rectClient.x > item->window.rectEffects.x) {
-						item->window.rectClient.x = item->window.rectEffects.x;
-						done++;
-					}
-				} else {
-					item->window.rectClient.x -= item->window.rectEffects2.x;
-					if (item->window.rectClient.x < item->window.rectEffects.x) {
-						item->window.rectClient.x = item->window.rectEffects.x;
-						done++;
-					}
-				}
-			}
-			if (item->window.rectClient.y == item->window.rectEffects.y) {
-				done++;
-			} else {
-				if (item->window.rectClient.y < item->window.rectEffects.y) {
-					item->window.rectClient.y += item->window.rectEffects2.y;
-					if (item->window.rectClient.y > item->window.rectEffects.y) {
-						item->window.rectClient.y = item->window.rectEffects.y;
-						done++;
-					}
-				} else {
-					item->window.rectClient.y -= item->window.rectEffects2.y;
-					if (item->window.rectClient.y < item->window.rectEffects.y) {
-						item->window.rectClient.y = item->window.rectEffects.y;
-						done++;
-					}
-				}
-			}
-			if (item->window.rectClient.w == item->window.rectEffects.w) {
-				done++;
-			} else {
-				if (item->window.rectClient.w < item->window.rectEffects.w) {
-					item->window.rectClient.w += item->window.rectEffects2.w;
-					if (item->window.rectClient.w > item->window.rectEffects.w) {
-						item->window.rectClient.w = item->window.rectEffects.w;
-						done++;
-					}
-				} else {
-					item->window.rectClient.w -= item->window.rectEffects2.w;
-					if (item->window.rectClient.w < item->window.rectEffects.w) {
-						item->window.rectClient.w = item->window.rectEffects.w;
-						done++;
-					}
-				}
-			}
-			if (item->window.rectClient.h == item->window.rectEffects.h) {
-				done++;
-			} else {
-				if (item->window.rectClient.h < item->window.rectEffects.h) {
-					item->window.rectClient.h += item->window.rectEffects2.h;
-					if (item->window.rectClient.h > item->window.rectEffects.h) {
-						item->window.rectClient.h = item->window.rectEffects.h;
-						done++;
-					}
-				} else {
-					item->window.rectClient.h -= item->window.rectEffects2.h;
-					if (item->window.rectClient.h < item->window.rectEffects.h) {
-						item->window.rectClient.h = item->window.rectEffects.h;
-						done++;
-					}
-				}
-			}
+      // transition the x,y
+      if (item->window.rectClient.x == item->window.rectEffects.x) {
+        done++;
+      } else {
+        if (item->window.rectClient.x < item->window.rectEffects.x) {
+          item->window.rectClient.x += item->window.rectEffects2.x;
+          if (item->window.rectClient.x > item->window.rectEffects.x) {
+            item->window.rectClient.x = item->window.rectEffects.x;
+            done++;
+          }
+        } else {
+          item->window.rectClient.x -= item->window.rectEffects2.x;
+          if (item->window.rectClient.x < item->window.rectEffects.x) {
+            item->window.rectClient.x = item->window.rectEffects.x;
+            done++;
+          }
+        }
+      }
+      if (item->window.rectClient.y == item->window.rectEffects.y) {
+        done++;
+      } else {
+        if (item->window.rectClient.y < item->window.rectEffects.y) {
+          item->window.rectClient.y += item->window.rectEffects2.y;
+          if (item->window.rectClient.y > item->window.rectEffects.y) {
+            item->window.rectClient.y = item->window.rectEffects.y;
+            done++;
+          }
+        } else {
+          item->window.rectClient.y -= item->window.rectEffects2.y;
+          if (item->window.rectClient.y < item->window.rectEffects.y) {
+            item->window.rectClient.y = item->window.rectEffects.y;
+            done++;
+          }
+        }
+      }
+      if (item->window.rectClient.w == item->window.rectEffects.w) {
+        done++;
+      } else {
+        if (item->window.rectClient.w < item->window.rectEffects.w) {
+          item->window.rectClient.w += item->window.rectEffects2.w;
+          if (item->window.rectClient.w > item->window.rectEffects.w) {
+            item->window.rectClient.w = item->window.rectEffects.w;
+            done++;
+          }
+        } else {
+          item->window.rectClient.w -= item->window.rectEffects2.w;
+          if (item->window.rectClient.w < item->window.rectEffects.w) {
+            item->window.rectClient.w = item->window.rectEffects.w;
+            done++;
+          }
+        }
+      }
+      if (item->window.rectClient.h == item->window.rectEffects.h) {
+        done++;
+      } else {
+        if (item->window.rectClient.h < item->window.rectEffects.h) {
+          item->window.rectClient.h += item->window.rectEffects2.h;
+          if (item->window.rectClient.h > item->window.rectEffects.h) {
+            item->window.rectClient.h = item->window.rectEffects.h;
+            done++;
+          }
+        } else {
+          item->window.rectClient.h -= item->window.rectEffects2.h;
+          if (item->window.rectClient.h < item->window.rectEffects.h) {
+            item->window.rectClient.h = item->window.rectEffects.h;
+            done++;
+          }
+        }
+      }
 
       Item_UpdatePosition(item);
 
@@ -3955,23 +3956,23 @@ void Item_Paint(itemDef_t *item) {
     }
   }
 
-	if (item->window.ownerDrawFlags && DC->ownerDrawVisible) {
-		if (!DC->ownerDrawVisible(item->window.ownerDrawFlags)) {
-			item->window.flags &= ~WINDOW_VISIBLE;
-		} else {
-			item->window.flags |= WINDOW_VISIBLE;
-		}
-	}
+  if (item->window.ownerDrawFlags && DC->ownerDrawVisible) {
+    if (!DC->ownerDrawVisible(item->window.ownerDrawFlags)) {
+      item->window.flags &= ~WINDOW_VISIBLE;
+    } else {
+      item->window.flags |= WINDOW_VISIBLE;
+    }
+  }
 
-	if (item->cvarFlags & (CVAR_SHOW | CVAR_HIDE)) {
-		if (!Item_EnableShowViaCvar(item, CVAR_SHOW)) {
-			return;
-		}
-	}
+  if (item->cvarFlags & (CVAR_SHOW | CVAR_HIDE)) {
+    if (!Item_EnableShowViaCvar(item, CVAR_SHOW)) {
+      return;
+    }
+  }
 
   if (item->window.flags & WINDOW_TIMEDVISIBLE) {
 
-	}
+  }
 
   if (!(item->window.flags & WINDOW_VISIBLE)) {
     return;
@@ -3981,8 +3982,8 @@ void Item_Paint(itemDef_t *item) {
   Window_Paint(&item->window, parent->fadeAmount , parent->fadeClamp, parent->fadeCycle);
 
   if (debugMode) {
-		vec4_t color;
-		rectDef_t *r = Item_CorrectedTextRect(item);
+    vec4_t color;
+    rectDef_t *r = Item_CorrectedTextRect(item);
     color[1] = color[3] = 1;
     color[0] = color[2] = 0;
     DC->drawRect(r->x, r->y, r->w, r->h, 1, color);
@@ -4036,12 +4037,12 @@ void Item_Paint(itemDef_t *item) {
 }
 
 void Menu_Init(menuDef_t *menu) {
-	memset(menu, 0, sizeof(menuDef_t));
-	menu->cursorItem = -1;
-	menu->fadeAmount = DC->Assets.fadeAmount;
-	menu->fadeClamp = DC->Assets.fadeClamp;
-	menu->fadeCycle = DC->Assets.fadeCycle;
-	Window_Init(&menu->window);
+  memset(menu, 0, sizeof(menuDef_t));
+  menu->cursorItem = -1;
+  menu->fadeAmount = DC->Assets.fadeAmount;
+  menu->fadeClamp = DC->Assets.fadeClamp;
+  menu->fadeCycle = DC->Assets.fadeCycle;
+  Window_Init(&menu->window);
 }
 
 itemDef_t *Menu_GetFocusedItem(menuDef_t *menu) {
@@ -4067,50 +4068,50 @@ menuDef_t *Menu_GetFocused() {
 }
 
 void Menu_ScrollFeeder(menuDef_t *menu, int feeder, qboolean down) {
-	if (menu) {
-		int i;
+  if (menu) {
+    int i;
     for (i = 0; i < menu->itemCount; i++) {
-			if (menu->items[i]->special == feeder) {
-				Item_ListBox_HandleKey(menu->items[i], (down) ? K_DOWNARROW : K_UPARROW, qtrue, qtrue);
-				return;
-			}
-		}
-	}
+      if (menu->items[i]->special == feeder) {
+        Item_ListBox_HandleKey(menu->items[i], (down) ? K_DOWNARROW : K_UPARROW, qtrue, qtrue);
+        return;
+      }
+    }
+  }
 }
 
 
 
 void Menu_SetFeederSelection(menuDef_t *menu, int feeder, int index, const char *name) {
-	if (menu == NULL) {
-		if (name == NULL) {
-			menu = Menu_GetFocused();
-		} else {
-			menu = Menus_FindByName(name);
-		}
-	}
-
-	if (menu) {
-		int i;
+  if (menu == NULL) {
+    if (name == NULL) {
+      menu = Menu_GetFocused();
+    } else {
+      menu = Menus_FindByName(name);
+    }
+  }
+
+  if (menu) {
+    int i;
     for (i = 0; i < menu->itemCount; i++) {
-			if (menu->items[i]->special == feeder) {
-				if (index == 0) {
-					listBoxDef_t *listPtr = (listBoxDef_t*)menu->items[i]->typeData;
-					listPtr->cursorPos = 0;
-					listPtr->startPos = 0;
-				}
-				menu->items[i]->cursorPos = index;
-				DC->feederSelection(menu->items[i]->special, menu->items[i]->cursorPos);
-				return;
-			}
-		}
-	}
+      if (menu->items[i]->special == feeder) {
+        if (index == 0) {
+          listBoxDef_t *listPtr = (listBoxDef_t*)menu->items[i]->typeData;
+          listPtr->cursorPos = 0;
+          listPtr->startPos = 0;
+        }
+        menu->items[i]->cursorPos = index;
+        DC->feederSelection(menu->items[i]->special, menu->items[i]->cursorPos);
+        return;
+      }
+    }
+  }
 }
 
 qboolean Menus_AnyFullScreenVisible() {
   int i;
   for (i = 0; i < menuCount; i++) {
     if (Menus[i].window.flags & WINDOW_VISIBLE && Menus[i].fullScreen) {
-			return qtrue;
+      return qtrue;
     }
   }
   return qfalse;
@@ -4119,28 +4120,28 @@ qboolean Menus_AnyFullScreenVisible() {
 menuDef_t *Menus_ActivateByName(const char *p) {
   int i;
   menuDef_t *m = NULL;
-	menuDef_t *focus = Menu_GetFocused();
+  menuDef_t *focus = Menu_GetFocused();
 
   for (i = 0; i < menuCount; i++) {
     if (Q_stricmp(Menus[i].window.name, p) == 0) {
-	    m = &Menus[i];
-			Menus_Activate(m);
-			if (openMenuCount < MAX_OPEN_MENUS && focus != NULL) {
-				menuStack[openMenuCount++] = focus;
-			}
+      m = &Menus[i];
+      Menus_Activate(m);
+      if (openMenuCount < MAX_OPEN_MENUS && focus != NULL) {
+        menuStack[openMenuCount++] = focus;
+      }
     } else {
       Menus[i].window.flags &= ~WINDOW_HASFOCUS;
     }
   }
-	Display_CloseCinematics();
+  Display_CloseCinematics();
   return m;
 }
 
 
 void Item_Init(itemDef_t *item) {
-	memset(item, 0, sizeof(itemDef_t));
-	item->textscale = 0.55f;
-	Window_Init(&item->window);
+  memset(item, 0, sizeof(itemDef_t));
+  item->textscale = 0.55f;
+  Window_Init(&item->window);
 }
 
 void Menu_HandleMouseMove(menuDef_t *menu, float x, float y) {
@@ -4156,14 +4157,14 @@ void Menu_HandleMouseMove(menuDef_t *menu, float x, float y) {
     return;
   }
 
-	if (itemCapture) {
-		//Item_MouseMove(itemCapture, x, y);
-		return;
-	}
+  if (itemCapture) {
+    //Item_MouseMove(itemCapture, x, y);
+    return;
+  }
 
-	if (g_waitingForKey || g_editingField) {
-		return;
-	}
+  if (g_waitingForKey || g_editingField) {
+    return;
+  }
 
   // FIXME: this is the whole issue of focus vs. mouse over.. 
   // need a better overall solution as i don't like going through everything twice
@@ -4176,37 +4177,37 @@ void Menu_HandleMouseMove(menuDef_t *menu, float x, float y) {
         continue;
       }
 
-			// items can be enabled and disabled based on cvars
-			if (menu->items[i]->cvarFlags & (CVAR_ENABLE | CVAR_DISABLE) && !Item_EnableShowViaCvar(menu->items[i], CVAR_ENABLE)) {
-				continue;
-			}
+      // items can be enabled and disabled based on cvars
+      if (menu->items[i]->cvarFlags & (CVAR_ENABLE | CVAR_DISABLE) && !Item_EnableShowViaCvar(menu->items[i], CVAR_ENABLE)) {
+        continue;
+      }
 
-			if (menu->items[i]->cvarFlags & (CVAR_SHOW | CVAR_HIDE) && !Item_EnableShowViaCvar(menu->items[i], CVAR_SHOW)) {
-				continue;
-			}
+      if (menu->items[i]->cvarFlags & (CVAR_SHOW | CVAR_HIDE) && !Item_EnableShowViaCvar(menu->items[i], CVAR_SHOW)) {
+        continue;
+      }
 
 
 
       if (Rect_ContainsPoint(&menu->items[i]->window.rect, x, y)) {
-				if (pass == 1) {
-					overItem = menu->items[i];
-					if (overItem->type == ITEM_TYPE_TEXT && overItem->text) {
-						if (!Rect_ContainsPoint(Item_CorrectedTextRect(overItem), x, y)) {
-							continue;
-						}
-					}
-					// if we are over an item
-					if (IsVisible(overItem->window.flags)) {
-						// different one
-						Item_MouseEnter(overItem, x, y);
-						// Item_SetMouseOver(overItem, qtrue);
-
-						// if item is not a decoration see if it can take focus
-						if (!focusSet) {
-							focusSet = Item_SetFocus(overItem, x, y);
-						}
-					}
-				}
+        if (pass == 1) {
+          overItem = menu->items[i];
+          if (overItem->type == ITEM_TYPE_TEXT && overItem->text) {
+            if (!Rect_ContainsPoint(Item_CorrectedTextRect(overItem), x, y)) {
+              continue;
+            }
+          }
+          // if we are over an item
+          if (IsVisible(overItem->window.flags)) {
+            // different one
+            Item_MouseEnter(overItem, x, y);
+            // Item_SetMouseOver(overItem, qtrue);
+
+            // if item is not a decoration see if it can take focus
+            if (!focusSet) {
+              focusSet = Item_SetFocus(overItem, x, y);
+            }
+          }
+        }
       } else if (menu->items[i]->window.flags & WINDOW_MOUSEOVER) {
           Item_MouseLeave(menu->items[i]);
           Item_SetMouseOver(menu->items[i], qfalse);
@@ -4217,47 +4218,47 @@ void Menu_HandleMouseMove(menuDef_t *menu, float x, float y) {
 }
 
 void Menu_Paint(menuDef_t *menu, qboolean forcePaint) {
-	int i;
-
-	if (menu == NULL) {
-		return;
-	}
-
-	if (!(menu->window.flags & WINDOW_VISIBLE) &&  !forcePaint) {
-		return;
-	}
-
-	if (menu->window.ownerDrawFlags && DC->ownerDrawVisible && !DC->ownerDrawVisible(menu->window.ownerDrawFlags)) {
-		return;
-	}
-	
-	if (forcePaint) {
-		menu->window.flags |= WINDOW_FORCED;
-	}
-
-	// draw the background if necessary
-	if (menu->fullScreen) {
-		// implies a background shader
-		// FIXME: make sure we have a default shader if fullscreen is set with no background
-		DC->drawHandlePic( 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, menu->window.background );
-	} else if (menu->window.background) {
-		// this allows a background shader without being full screen
-		//UI_DrawHandlePic(menu->window.rect.x, menu->window.rect.y, menu->window.rect.w, menu->window.rect.h, menu->backgroundShader);
-	}
-
-	// paint the background and or border
-	Window_Paint(&menu->window, menu->fadeAmount, menu->fadeClamp, menu->fadeCycle );
-
-	for (i = 0; i < menu->itemCount; i++) {
-		Item_Paint(menu->items[i]);
-	}
-
-	if (debugMode) {
-		vec4_t color;
-		color[0] = color[2] = color[3] = 1;
-		color[1] = 0;
-		DC->drawRect(menu->window.rect.x, menu->window.rect.y, menu->window.rect.w, menu->window.rect.h, 1, color);
-	}
+  int i;
+
+  if (menu == NULL) {
+    return;
+  }
+
+  if (!(menu->window.flags & WINDOW_VISIBLE) &&  !forcePaint) {
+    return;
+  }
+
+  if (menu->window.ownerDrawFlags && DC->ownerDrawVisible && !DC->ownerDrawVisible(menu->window.ownerDrawFlags)) {
+    return;
+  }
+  
+  if (forcePaint) {
+    menu->window.flags |= WINDOW_FORCED;
+  }
+
+  // draw the background if necessary
+  if (menu->fullScreen) {
+    // implies a background shader
+    // FIXME: make sure we have a default shader if fullscreen is set with no background
+    DC->drawHandlePic( 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, menu->window.background );
+  } else if (menu->window.background) {
+    // this allows a background shader without being full screen
+    //UI_DrawHandlePic(menu->window.rect.x, menu->window.rect.y, menu->window.rect.w, menu->window.rect.h, menu->backgroundShader);
+  }
+
+  // paint the background and or border
+  Window_Paint(&menu->window, menu->fadeAmount, menu->fadeClamp, menu->fadeCycle );
+
+  for (i = 0; i < menu->itemCount; i++) {
+    Item_Paint(menu->items[i]);
+  }
+
+  if (debugMode) {
+    vec4_t color;
+    color[0] = color[2] = color[3] = 1;
+    color[1] = 0;
+    DC->drawRect(menu->window.rect.x, menu->window.rect.y, menu->window.rect.w, menu->window.rect.h, 1, color);
+  }
 }
 
 /*
@@ -4266,26 +4267,26 @@ Item_ValidateTypeData
 ===============
 */
 void Item_ValidateTypeData(itemDef_t *item) {
-	if (item->typeData) {
-		return;
-	}
-
-	if (item->type == ITEM_TYPE_LISTBOX) {
-		item->typeData = UI_Alloc(sizeof(listBoxDef_t));
-		memset(item->typeData, 0, sizeof(listBoxDef_t));
-	} else if (item->type == ITEM_TYPE_EDITFIELD || item->type == ITEM_TYPE_NUMERICFIELD || item->type == ITEM_TYPE_YESNO || item->type == ITEM_TYPE_BIND || item->type == ITEM_TYPE_SLIDER || item->type == ITEM_TYPE_TEXT) {
-		item->typeData = UI_Alloc(sizeof(editFieldDef_t));
-		memset(item->typeData, 0, sizeof(editFieldDef_t));
-		if (item->type == ITEM_TYPE_EDITFIELD) {
-			if (!((editFieldDef_t *) item->typeData)->maxPaintChars) {
-				((editFieldDef_t *) item->typeData)->maxPaintChars = MAX_EDITFIELD;
-			}
-		}
-	} else if (item->type == ITEM_TYPE_MULTI) {
-		item->typeData = UI_Alloc(sizeof(multiDef_t));
-	} else if (item->type == ITEM_TYPE_MODEL) {
-		item->typeData = UI_Alloc(sizeof(modelDef_t));
-	}
+  if (item->typeData) {
+    return;
+  }
+
+  if (item->type == ITEM_TYPE_LISTBOX) {
+    item->typeData = UI_Alloc(sizeof(listBoxDef_t));
+    memset(item->typeData, 0, sizeof(listBoxDef_t));
+  } else if (item->type == ITEM_TYPE_EDITFIELD || item->type == ITEM_TYPE_NUMERICFIELD || item->type == ITEM_TYPE_YESNO || item->type == ITEM_TYPE_BIND || item->type == ITEM_TYPE_SLIDER || item->type == ITEM_TYPE_TEXT) {
+    item->typeData = UI_Alloc(sizeof(editFieldDef_t));
+    memset(item->typeData, 0, sizeof(editFieldDef_t));
+    if (item->type == ITEM_TYPE_EDITFIELD) {
+      if (!((editFieldDef_t *) item->typeData)->maxPaintChars) {
+        ((editFieldDef_t *) item->typeData)->maxPaintChars = MAX_EDITFIELD;
+      }
+    }
+  } else if (item->type == ITEM_TYPE_MULTI) {
+    item->typeData = UI_Alloc(sizeof(multiDef_t));
+  } else if (item->type == ITEM_TYPE_MODEL) {
+    item->typeData = UI_Alloc(sizeof(modelDef_t));
+  }
 }
 
 /*
@@ -4294,53 +4295,53 @@ Keyword Hash
 ===============
 */
 
-#define KEYWORDHASH_SIZE	512
+#define KEYWORDHASH_SIZE  512
 
 typedef struct keywordHash_s
 {
-	char *keyword;
-	qboolean (*func)(itemDef_t *item, int handle);
-	struct keywordHash_s *next;
+  char *keyword;
+  qboolean (*func)(itemDef_t *item, int handle);
+  struct keywordHash_s *next;
 } keywordHash_t;
 
 int KeywordHash_Key(char *keyword) {
-	int register hash, i;
-
-	hash = 0;
-	for (i = 0; keyword[i] != '\0'; i++) {
-		if (keyword[i] >= 'A' && keyword[i] <= 'Z')
-			hash += (keyword[i] + ('a' - 'A')) * (119 + i);
-		else
-			hash += keyword[i] * (119 + i);
-	}
-	hash = (hash ^ (hash >> 10) ^ (hash >> 20)) & (KEYWORDHASH_SIZE-1);
-	return hash;
+  int register hash, i;
+
+  hash = 0;
+  for (i = 0; keyword[i] != '\0'; i++) {
+    if (keyword[i] >= 'A' && keyword[i] <= 'Z')
+      hash += (keyword[i] + ('a' - 'A')) * (119 + i);
+    else
+      hash += keyword[i] * (119 + i);
+  }
+  hash = (hash ^ (hash >> 10) ^ (hash >> 20)) & (KEYWORDHASH_SIZE-1);
+  return hash;
 }
 
 void KeywordHash_Add(keywordHash_t *table[], keywordHash_t *key) {
-	int hash;
+  int hash;
 
-	hash = KeywordHash_Key(key->keyword);
+  hash = KeywordHash_Key(key->keyword);
 /*
-	if (table[hash]) {
-		int collision = qtrue;
-	}
+  if (table[hash]) {
+    int collision = qtrue;
+  }
 */
-	key->next = table[hash];
-	table[hash] = key;
+  key->next = table[hash];
+  table[hash] = key;
 }
 
 keywordHash_t *KeywordHash_Find(keywordHash_t *table[], char *keyword)
 {
-	keywordHash_t *key;
-	int hash;
+  keywordHash_t *key;
+  int hash;
 
-	hash = KeywordHash_Key(keyword);
-	for (key = table[hash]; key; key = key->next) {
-		if (!Q_stricmp(key->keyword, keyword))
-			return key;
-	}
-	return NULL;
+  hash = KeywordHash_Key(keyword);
+  for (key = table[hash]; key; key = key->next) {
+    if (!Q_stricmp(key->keyword, keyword))
+      return key;
+  }
+  return NULL;
 }
 
 /*
@@ -4351,772 +4352,772 @@ Item Keyword Parse functions
 
 // name <string>
 qboolean ItemParse_name( itemDef_t *item, int handle ) {
-	if (!PC_String_Parse(handle, &item->window.name)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_String_Parse(handle, &item->window.name)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 // name <string>
 qboolean ItemParse_focusSound( itemDef_t *item, int handle ) {
-	const char *temp;
-	if (!PC_String_Parse(handle, &temp)) {
-		return qfalse;
-	}
-	item->focusSound = DC->registerSound(temp, qfalse);
-	return qtrue;
+  const char *temp;
+  if (!PC_String_Parse(handle, &temp)) {
+    return qfalse;
+  }
+  item->focusSound = DC->registerSound(temp, qfalse);
+  return qtrue;
 }
 
 
 // text <string>
 qboolean ItemParse_text( itemDef_t *item, int handle ) {
-	if (!PC_String_Parse(handle, &item->text)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_String_Parse(handle, &item->text)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 // group <string>
 qboolean ItemParse_group( itemDef_t *item, int handle ) {
-	if (!PC_String_Parse(handle, &item->window.group)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_String_Parse(handle, &item->window.group)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 // asset_model <string>
 qboolean ItemParse_asset_model( itemDef_t *item, int handle ) {
-	const char *temp;
-	modelDef_t *modelPtr;
-	Item_ValidateTypeData(item);
-	modelPtr = (modelDef_t*)item->typeData;
+  const char *temp;
+  modelDef_t *modelPtr;
+  Item_ValidateTypeData(item);
+  modelPtr = (modelDef_t*)item->typeData;
 
-	if (!PC_String_Parse(handle, &temp)) {
-		return qfalse;
-	}
-	item->asset = DC->registerModel(temp);
-	modelPtr->angle = rand() % 360;
-	return qtrue;
+  if (!PC_String_Parse(handle, &temp)) {
+    return qfalse;
+  }
+  item->asset = DC->registerModel(temp);
+  modelPtr->angle = rand() % 360;
+  return qtrue;
 }
 
 // asset_shader <string>
 qboolean ItemParse_asset_shader( itemDef_t *item, int handle ) {
-	const char *temp;
+  const char *temp;
 
-	if (!PC_String_Parse(handle, &temp)) {
-		return qfalse;
-	}
-	item->asset = DC->registerShaderNoMip(temp);
-	return qtrue;
+  if (!PC_String_Parse(handle, &temp)) {
+    return qfalse;
+  }
+  item->asset = DC->registerShaderNoMip(temp);
+  return qtrue;
 }
 
 // model_origin <number> <number> <number>
 qboolean ItemParse_model_origin( itemDef_t *item, int handle ) {
-	modelDef_t *modelPtr;
-	Item_ValidateTypeData(item);
-	modelPtr = (modelDef_t*)item->typeData;
-
-	if (PC_Float_Parse(handle, &modelPtr->origin[0])) {
-		if (PC_Float_Parse(handle, &modelPtr->origin[1])) {
-			if (PC_Float_Parse(handle, &modelPtr->origin[2])) {
-				return qtrue;
-			}
-		}
-	}
-	return qfalse;
+  modelDef_t *modelPtr;
+  Item_ValidateTypeData(item);
+  modelPtr = (modelDef_t*)item->typeData;
+
+  if (PC_Float_Parse(handle, &modelPtr->origin[0])) {
+    if (PC_Float_Parse(handle, &modelPtr->origin[1])) {
+      if (PC_Float_Parse(handle, &modelPtr->origin[2])) {
+        return qtrue;
+      }
+    }
+  }
+  return qfalse;
 }
 
 // model_fovx <number>
 qboolean ItemParse_model_fovx( itemDef_t *item, int handle ) {
-	modelDef_t *modelPtr;
-	Item_ValidateTypeData(item);
-	modelPtr = (modelDef_t*)item->typeData;
+  modelDef_t *modelPtr;
+  Item_ValidateTypeData(item);
+  modelPtr = (modelDef_t*)item->typeData;
 
-	if (!PC_Float_Parse(handle, &modelPtr->fov_x)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Float_Parse(handle, &modelPtr->fov_x)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 // model_fovy <number>
 qboolean ItemParse_model_fovy( itemDef_t *item, int handle ) {
-	modelDef_t *modelPtr;
-	Item_ValidateTypeData(item);
-	modelPtr = (modelDef_t*)item->typeData;
+  modelDef_t *modelPtr;
+  Item_ValidateTypeData(item);
+  modelPtr = (modelDef_t*)item->typeData;
 
-	if (!PC_Float_Parse(handle, &modelPtr->fov_y)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Float_Parse(handle, &modelPtr->fov_y)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 // model_rotation <integer>
 qboolean ItemParse_model_rotation( itemDef_t *item, int handle ) {
-	modelDef_t *modelPtr;
-	Item_ValidateTypeData(item);
-	modelPtr = (modelDef_t*)item->typeData;
+  modelDef_t *modelPtr;
+  Item_ValidateTypeData(item);
+  modelPtr = (modelDef_t*)item->typeData;
 
-	if (!PC_Int_Parse(handle, &modelPtr->rotationSpeed)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Int_Parse(handle, &modelPtr->rotationSpeed)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 // model_angle <integer>
 qboolean ItemParse_model_angle( itemDef_t *item, int handle ) {
-	modelDef_t *modelPtr;
-	Item_ValidateTypeData(item);
-	modelPtr = (modelDef_t*)item->typeData;
+  modelDef_t *modelPtr;
+  Item_ValidateTypeData(item);
+  modelPtr = (modelDef_t*)item->typeData;
 
-	if (!PC_Int_Parse(handle, &modelPtr->angle)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Int_Parse(handle, &modelPtr->angle)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 // rect <rectangle>
 qboolean ItemParse_rect( itemDef_t *item, int handle ) {
-	if (!PC_Rect_Parse(handle, &item->window.rectClient)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Rect_Parse(handle, &item->window.rectClient)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 // style <integer>
 qboolean ItemParse_style( itemDef_t *item, int handle ) {
-	if (!PC_Int_Parse(handle, &item->window.style)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Int_Parse(handle, &item->window.style)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 // decoration
 qboolean ItemParse_decoration( itemDef_t *item, int handle ) {
-	item->window.flags |= WINDOW_DECORATION;
-	return qtrue;
+  item->window.flags |= WINDOW_DECORATION;
+  return qtrue;
 }
 
 // notselectable
 qboolean ItemParse_notselectable( itemDef_t *item, int handle ) {
-	listBoxDef_t *listPtr;
-	Item_ValidateTypeData(item);
-	listPtr = (listBoxDef_t*)item->typeData;
-	if (item->type == ITEM_TYPE_LISTBOX && listPtr) {
-		listPtr->notselectable = qtrue;
-	}
-	return qtrue;
+  listBoxDef_t *listPtr;
+  Item_ValidateTypeData(item);
+  listPtr = (listBoxDef_t*)item->typeData;
+  if (item->type == ITEM_TYPE_LISTBOX && listPtr) {
+    listPtr->notselectable = qtrue;
+  }
+  return qtrue;
 }
 
 // manually wrapped
 qboolean ItemParse_wrapped( itemDef_t *item, int handle ) {
-	item->window.flags |= WINDOW_WRAPPED;
-	return qtrue;
+  item->window.flags |= WINDOW_WRAPPED;
+  return qtrue;
 }
 
 // auto wrapped
 qboolean ItemParse_autowrapped( itemDef_t *item, int handle ) {
-	item->window.flags |= WINDOW_AUTOWRAPPED;
-	return qtrue;
+  item->window.flags |= WINDOW_AUTOWRAPPED;
+  return qtrue;
 }
 
 
 // horizontalscroll
 qboolean ItemParse_horizontalscroll( itemDef_t *item, int handle ) {
-	item->window.flags |= WINDOW_HORIZONTAL;
-	return qtrue;
+  item->window.flags |= WINDOW_HORIZONTAL;
+  return qtrue;
 }
 
 // type <integer>
 qboolean ItemParse_type( itemDef_t *item, int handle ) {
-	if (!PC_Int_Parse(handle, &item->type)) {
-		return qfalse;
-	}
-	Item_ValidateTypeData(item);
-	return qtrue;
+  if (!PC_Int_Parse(handle, &item->type)) {
+    return qfalse;
+  }
+  Item_ValidateTypeData(item);
+  return qtrue;
 }
 
 // elementwidth, used for listbox image elements
 // uses textalignx for storage
 qboolean ItemParse_elementwidth( itemDef_t *item, int handle ) {
-	listBoxDef_t *listPtr;
+  listBoxDef_t *listPtr;
 
-	Item_ValidateTypeData(item);
-	listPtr = (listBoxDef_t*)item->typeData;
-	if (!PC_Float_Parse(handle, &listPtr->elementWidth)) {
-		return qfalse;
-	}
-	return qtrue;
+  Item_ValidateTypeData(item);
+  listPtr = (listBoxDef_t*)item->typeData;
+  if (!PC_Float_Parse(handle, &listPtr->elementWidth)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 // elementheight, used for listbox image elements
 // uses textaligny for storage
 qboolean ItemParse_elementheight( itemDef_t *item, int handle ) {
-	listBoxDef_t *listPtr;
+  listBoxDef_t *listPtr;
 
-	Item_ValidateTypeData(item);
-	listPtr = (listBoxDef_t*)item->typeData;
-	if (!PC_Float_Parse(handle, &listPtr->elementHeight)) {
-		return qfalse;
-	}
-	return qtrue;
+  Item_ValidateTypeData(item);
+  listPtr = (listBoxDef_t*)item->typeData;
+  if (!PC_Float_Parse(handle, &listPtr->elementHeight)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 // feeder <float>
 qboolean ItemParse_feeder( itemDef_t *item, int handle ) {
-	if (!PC_Float_Parse(handle, &item->special)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Float_Parse(handle, &item->special)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 // elementtype, used to specify what type of elements a listbox contains
 // uses textstyle for storage
 qboolean ItemParse_elementtype( itemDef_t *item, int handle ) {
-	listBoxDef_t *listPtr;
-
-	Item_ValidateTypeData(item);
-	if (!item->typeData)
-		return qfalse;
-	listPtr = (listBoxDef_t*)item->typeData;
-	if (!PC_Int_Parse(handle, &listPtr->elementStyle)) {
-		return qfalse;
-	}
-	return qtrue;
+  listBoxDef_t *listPtr;
+
+  Item_ValidateTypeData(item);
+  if (!item->typeData)
+    return qfalse;
+  listPtr = (listBoxDef_t*)item->typeData;
+  if (!PC_Int_Parse(handle, &listPtr->elementStyle)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 // columns sets a number of columns and an x pos and width per.. 
 qboolean ItemParse_columns( itemDef_t *item, int handle ) {
-	int num, i;
-	listBoxDef_t *listPtr;
-
-	Item_ValidateTypeData(item);
-	if (!item->typeData)
-		return qfalse;
-	listPtr = (listBoxDef_t*)item->typeData;
-	if (PC_Int_Parse(handle, &num)) {
-		if (num > MAX_LB_COLUMNS) {
-			num = MAX_LB_COLUMNS;
-		}
-		listPtr->numColumns = num;
-		for (i = 0; i < num; i++) {
-			int pos, width, maxChars;
-
-			if (PC_Int_Parse(handle, &pos) && PC_Int_Parse(handle, &width) && PC_Int_Parse(handle, &maxChars)) {
-				listPtr->columnInfo[i].pos = pos;
-				listPtr->columnInfo[i].width = width;
-				listPtr->columnInfo[i].maxChars = maxChars;
-			} else {
-				return qfalse;
-			}
-		}
-	} else {
-		return qfalse;
-	}
-	return qtrue;
+  int num, i;
+  listBoxDef_t *listPtr;
+
+  Item_ValidateTypeData(item);
+  if (!item->typeData)
+    return qfalse;
+  listPtr = (listBoxDef_t*)item->typeData;
+  if (PC_Int_Parse(handle, &num)) {
+    if (num > MAX_LB_COLUMNS) {
+      num = MAX_LB_COLUMNS;
+    }
+    listPtr->numColumns = num;
+    for (i = 0; i < num; i++) {
+      int pos, width, maxChars;
+
+      if (PC_Int_Parse(handle, &pos) && PC_Int_Parse(handle, &width) && PC_Int_Parse(handle, &maxChars)) {
+        listPtr->columnInfo[i].pos = pos;
+        listPtr->columnInfo[i].width = width;
+        listPtr->columnInfo[i].maxChars = maxChars;
+      } else {
+        return qfalse;
+      }
+    }
+  } else {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_border( itemDef_t *item, int handle ) {
-	if (!PC_Int_Parse(handle, &item->window.border)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Int_Parse(handle, &item->window.border)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_bordersize( itemDef_t *item, int handle ) {
-	if (!PC_Float_Parse(handle, &item->window.borderSize)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Float_Parse(handle, &item->window.borderSize)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_visible( itemDef_t *item, int handle ) {
-	int i;
+  int i;
 
-	if (!PC_Int_Parse(handle, &i)) {
-		return qfalse;
-	}
-	if (i) {
-		item->window.flags |= WINDOW_VISIBLE;
-	}
-	return qtrue;
+  if (!PC_Int_Parse(handle, &i)) {
+    return qfalse;
+  }
+  if (i) {
+    item->window.flags |= WINDOW_VISIBLE;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_ownerdraw( itemDef_t *item, int handle ) {
-	if (!PC_Int_Parse(handle, &item->window.ownerDraw)) {
-		return qfalse;
-	}
-	item->type = ITEM_TYPE_OWNERDRAW;
-	return qtrue;
+  if (!PC_Int_Parse(handle, &item->window.ownerDraw)) {
+    return qfalse;
+  }
+  item->type = ITEM_TYPE_OWNERDRAW;
+  return qtrue;
 }
 
 qboolean ItemParse_align( itemDef_t *item, int handle ) {
-	if (!PC_Int_Parse(handle, &item->alignment)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Int_Parse(handle, &item->alignment)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_textalign( itemDef_t *item, int handle ) {
-	if (!PC_Int_Parse(handle, &item->textalignment)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Int_Parse(handle, &item->textalignment)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_textalignx( itemDef_t *item, int handle ) {
-	if (!PC_Float_Parse(handle, &item->textalignx)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Float_Parse(handle, &item->textalignx)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_textaligny( itemDef_t *item, int handle ) {
-	if (!PC_Float_Parse(handle, &item->textaligny)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Float_Parse(handle, &item->textaligny)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_textscale( itemDef_t *item, int handle ) {
-	if (!PC_Float_Parse(handle, &item->textscale)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Float_Parse(handle, &item->textscale)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_textstyle( itemDef_t *item, int handle ) {
-	if (!PC_Int_Parse(handle, &item->textStyle)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Int_Parse(handle, &item->textStyle)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_backcolor( itemDef_t *item, int handle ) {
-	int i;
-	float f;
+  int i;
+  float f;
 
-	for (i = 0; i < 4; i++) {
-		if (!PC_Float_Parse(handle, &f)) {
-			return qfalse;
-		}
-		item->window.backColor[i]  = f;
-	}
-	return qtrue;
+  for (i = 0; i < 4; i++) {
+    if (!PC_Float_Parse(handle, &f)) {
+      return qfalse;
+    }
+    item->window.backColor[i]  = f;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_forecolor( itemDef_t *item, int handle ) {
-	int i;
-	float f;
+  int i;
+  float f;
 
-	for (i = 0; i < 4; i++) {
-		if (!PC_Float_Parse(handle, &f)) {
-			return qfalse;
-		}
-		item->window.foreColor[i]  = f;
-		item->window.flags |= WINDOW_FORECOLORSET;
-	}
-	return qtrue;
+  for (i = 0; i < 4; i++) {
+    if (!PC_Float_Parse(handle, &f)) {
+      return qfalse;
+    }
+    item->window.foreColor[i]  = f;
+    item->window.flags |= WINDOW_FORECOLORSET;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_bordercolor( itemDef_t *item, int handle ) {
-	int i;
-	float f;
+  int i;
+  float f;
 
-	for (i = 0; i < 4; i++) {
-		if (!PC_Float_Parse(handle, &f)) {
-			return qfalse;
-		}
-		item->window.borderColor[i]  = f;
-	}
-	return qtrue;
+  for (i = 0; i < 4; i++) {
+    if (!PC_Float_Parse(handle, &f)) {
+      return qfalse;
+    }
+    item->window.borderColor[i]  = f;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_outlinecolor( itemDef_t *item, int handle ) {
-	if (!PC_Color_Parse(handle, &item->window.outlineColor)){
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Color_Parse(handle, &item->window.outlineColor)){
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_background( itemDef_t *item, int handle ) {
-	const char *temp;
+  const char *temp;
 
-	if (!PC_String_Parse(handle, &temp)) {
-		return qfalse;
-	}
-	item->window.background = DC->registerShaderNoMip(temp);
-	return qtrue;
+  if (!PC_String_Parse(handle, &temp)) {
+    return qfalse;
+  }
+  item->window.background = DC->registerShaderNoMip(temp);
+  return qtrue;
 }
 
 qboolean ItemParse_cinematic( itemDef_t *item, int handle ) {
-	if (!PC_String_Parse(handle, &item->window.cinematicName)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_String_Parse(handle, &item->window.cinematicName)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_doubleClick( itemDef_t *item, int handle ) {
-	listBoxDef_t *listPtr;
+  listBoxDef_t *listPtr;
 
-	Item_ValidateTypeData(item);
-	if (!item->typeData) {
-		return qfalse;
-	}
+  Item_ValidateTypeData(item);
+  if (!item->typeData) {
+    return qfalse;
+  }
 
-	listPtr = (listBoxDef_t*)item->typeData;
+  listPtr = (listBoxDef_t*)item->typeData;
 
-	if (!PC_Script_Parse(handle, &listPtr->doubleClick)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Script_Parse(handle, &listPtr->doubleClick)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_onFocus( itemDef_t *item, int handle ) {
-	if (!PC_Script_Parse(handle, &item->onFocus)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Script_Parse(handle, &item->onFocus)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_leaveFocus( itemDef_t *item, int handle ) {
-	if (!PC_Script_Parse(handle, &item->leaveFocus)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Script_Parse(handle, &item->leaveFocus)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_mouseEnter( itemDef_t *item, int handle ) {
-	if (!PC_Script_Parse(handle, &item->mouseEnter)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Script_Parse(handle, &item->mouseEnter)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_mouseExit( itemDef_t *item, int handle ) {
-	if (!PC_Script_Parse(handle, &item->mouseExit)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Script_Parse(handle, &item->mouseExit)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_mouseEnterText( itemDef_t *item, int handle ) {
-	if (!PC_Script_Parse(handle, &item->mouseEnterText)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Script_Parse(handle, &item->mouseEnterText)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_mouseExitText( itemDef_t *item, int handle ) {
-	if (!PC_Script_Parse(handle, &item->mouseExitText)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Script_Parse(handle, &item->mouseExitText)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_action( itemDef_t *item, int handle ) {
-	if (!PC_Script_Parse(handle, &item->action)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Script_Parse(handle, &item->action)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_special( itemDef_t *item, int handle ) {
-	if (!PC_Float_Parse(handle, &item->special)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Float_Parse(handle, &item->special)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_cvarTest( itemDef_t *item, int handle ) {
-	if (!PC_String_Parse(handle, &item->cvarTest)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_String_Parse(handle, &item->cvarTest)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_cvar( itemDef_t *item, int handle ) {
-	editFieldDef_t *editPtr;
+  editFieldDef_t *editPtr;
 
-	Item_ValidateTypeData(item);
-	if (!PC_String_Parse(handle, &item->cvar)) {
-		return qfalse;
-	}
-	if (item->typeData) {
-		editPtr = (editFieldDef_t*)item->typeData;
-		editPtr->minVal = -1;
-		editPtr->maxVal = -1;
-		editPtr->defVal = -1;
-	}
-	return qtrue;
+  Item_ValidateTypeData(item);
+  if (!PC_String_Parse(handle, &item->cvar)) {
+    return qfalse;
+  }
+  if (item->typeData) {
+    editPtr = (editFieldDef_t*)item->typeData;
+    editPtr->minVal = -1;
+    editPtr->maxVal = -1;
+    editPtr->defVal = -1;
+  }
+  return qtrue;
 }
 
 qboolean ItemParse_maxChars( itemDef_t *item, int handle ) {
-	editFieldDef_t *editPtr;
-	int maxChars;
+  editFieldDef_t *editPtr;
+  int maxChars;
 
-	Item_ValidateTypeData(item);
-	if (!item->typeData)
-		return qfalse;
+  Item_ValidateTypeData(item);
+  if (!item->typeData)
+    return qfalse;
 
-	if (!PC_Int_Parse(handle, &maxChars)) {
-		return qfalse;
-	}
-	editPtr = (editFieldDef_t*)item->typeData;
-	editPtr->maxChars = maxChars;
-	return qtrue;
+  if (!PC_Int_Parse(handle, &maxChars)) {
+    return qfalse;
+  }
+  editPtr = (editFieldDef_t*)item->typeData;
+  editPtr->maxChars = maxChars;
+  return qtrue;
 }
 
 qboolean ItemParse_maxPaintChars( itemDef_t *item, int handle ) {
-	editFieldDef_t *editPtr;
-	int maxChars;
+  editFieldDef_t *editPtr;
+  int maxChars;
 
-	Item_ValidateTypeData(item);
-	if (!item->typeData)
-		return qfalse;
+  Item_ValidateTypeData(item);
+  if (!item->typeData)
+    return qfalse;
 
-	if (!PC_Int_Parse(handle, &maxChars)) {
-		return qfalse;
-	}
-	editPtr = (editFieldDef_t*)item->typeData;
-	editPtr->maxPaintChars = maxChars;
-	return qtrue;
+  if (!PC_Int_Parse(handle, &maxChars)) {
+    return qfalse;
+  }
+  editPtr = (editFieldDef_t*)item->typeData;
+  editPtr->maxPaintChars = maxChars;
+  return qtrue;
 }
 
 
 
 qboolean ItemParse_cvarFloat( itemDef_t *item, int handle ) {
-	editFieldDef_t *editPtr;
-
-	Item_ValidateTypeData(item);
-	if (!item->typeData)
-		return qfalse;
-	editPtr = (editFieldDef_t*)item->typeData;
-	if (PC_String_Parse(handle, &item->cvar) &&
-		PC_Float_Parse(handle, &editPtr->defVal) &&
-		PC_Float_Parse(handle, &editPtr->minVal) &&
-		PC_Float_Parse(handle, &editPtr->maxVal)) {
-		return qtrue;
-	}
-	return qfalse;
+  editFieldDef_t *editPtr;
+
+  Item_ValidateTypeData(item);
+  if (!item->typeData)
+    return qfalse;
+  editPtr = (editFieldDef_t*)item->typeData;
+  if (PC_String_Parse(handle, &item->cvar) &&
+    PC_Float_Parse(handle, &editPtr->defVal) &&
+    PC_Float_Parse(handle, &editPtr->minVal) &&
+    PC_Float_Parse(handle, &editPtr->maxVal)) {
+    return qtrue;
+  }
+  return qfalse;
 }
 
 qboolean ItemParse_cvarStrList( itemDef_t *item, int handle ) {
-	pc_token_t token;
-	multiDef_t *multiPtr;
-	int pass;
-	
-	Item_ValidateTypeData(item);
-	if (!item->typeData)
-		return qfalse;
-	multiPtr = (multiDef_t*)item->typeData;
-	multiPtr->count = 0;
-	multiPtr->strDef = qtrue;
-
-	if (!trap_PC_ReadToken(handle, &token))
-		return qfalse;
-	if (*token.string != '{') {
-		return qfalse;
-	}
-
-	pass = 0;
-	while ( 1 ) {
-		if (!trap_PC_ReadToken(handle, &token)) {
-			PC_SourceError(handle, "end of file inside menu item\n");
-			return qfalse;
-		}
-
-		if (*token.string == '}') {
-			return qtrue;
-		}
-
-		if (*token.string == ',' || *token.string == ';') {
-			continue;
-		}
-
-		if (pass == 0) {
-			multiPtr->cvarList[multiPtr->count] = String_Alloc(token.string);
-			pass = 1;
-		} else {
-			multiPtr->cvarStr[multiPtr->count] = String_Alloc(token.string);
-			pass = 0;
-			multiPtr->count++;
-			if (multiPtr->count >= MAX_MULTI_CVARS) {
-				return qfalse;
-			}
-		}
-
-	}
-	return qfalse; 	// bk001205 - LCC missing return value
+  pc_token_t token;
+  multiDef_t *multiPtr;
+  int pass;
+  
+  Item_ValidateTypeData(item);
+  if (!item->typeData)
+    return qfalse;
+  multiPtr = (multiDef_t*)item->typeData;
+  multiPtr->count = 0;
+  multiPtr->strDef = qtrue;
+
+  if (!trap_PC_ReadToken(handle, &token))
+    return qfalse;
+  if (*token.string != '{') {
+    return qfalse;
+  }
+
+  pass = 0;
+  while ( 1 ) {
+    if (!trap_PC_ReadToken(handle, &token)) {
+      PC_SourceError(handle, "end of file inside menu item\n");
+      return qfalse;
+    }
+
+    if (*token.string == '}') {
+      return qtrue;
+    }
+
+    if (*token.string == ',' || *token.string == ';') {
+      continue;
+    }
+
+    if (pass == 0) {
+      multiPtr->cvarList[multiPtr->count] = String_Alloc(token.string);
+      pass = 1;
+    } else {
+      multiPtr->cvarStr[multiPtr->count] = String_Alloc(token.string);
+      pass = 0;
+      multiPtr->count++;
+      if (multiPtr->count >= MAX_MULTI_CVARS) {
+        return qfalse;
+      }
+    }
+
+  }
+  return qfalse;  // bk001205 - LCC missing return value
 }
 
 qboolean ItemParse_cvarFloatList( itemDef_t *item, int handle ) {
-	pc_token_t token;
-	multiDef_t *multiPtr;
-	
-	Item_ValidateTypeData(item);
-	if (!item->typeData)
-		return qfalse;
-	multiPtr = (multiDef_t*)item->typeData;
-	multiPtr->count = 0;
-	multiPtr->strDef = qfalse;
-
-	if (!trap_PC_ReadToken(handle, &token))
-		return qfalse;
-	if (*token.string != '{') {
-		return qfalse;
-	}
+  pc_token_t token;
+  multiDef_t *multiPtr;
+  
+  Item_ValidateTypeData(item);
+  if (!item->typeData)
+    return qfalse;
+  multiPtr = (multiDef_t*)item->typeData;
+  multiPtr->count = 0;
+  multiPtr->strDef = qfalse;
+
+  if (!trap_PC_ReadToken(handle, &token))
+    return qfalse;
+  if (*token.string != '{') {
+    return qfalse;
+  }
 
-	while ( 1 ) {
-		if (!trap_PC_ReadToken(handle, &token)) {
-			PC_SourceError(handle, "end of file inside menu item\n");
-			return qfalse;
-		}
+  while ( 1 ) {
+    if (!trap_PC_ReadToken(handle, &token)) {
+      PC_SourceError(handle, "end of file inside menu item\n");
+      return qfalse;
+    }
 
-		if (*token.string == '}') {
-			return qtrue;
-		}
+    if (*token.string == '}') {
+      return qtrue;
+    }
 
-		if (*token.string == ',' || *token.string == ';') {
-			continue;
-		}
+    if (*token.string == ',' || *token.string == ';') {
+      continue;
+    }
 
-		multiPtr->cvarList[multiPtr->count] = String_Alloc(token.string);
-		if (!PC_Float_Parse(handle, &multiPtr->cvarValue[multiPtr->count])) {
-			return qfalse;
-		}
+    multiPtr->cvarList[multiPtr->count] = String_Alloc(token.string);
+    if (!PC_Float_Parse(handle, &multiPtr->cvarValue[multiPtr->count])) {
+      return qfalse;
+    }
 
-		multiPtr->count++;
-		if (multiPtr->count >= MAX_MULTI_CVARS) {
-			return qfalse;
-		}
+    multiPtr->count++;
+    if (multiPtr->count >= MAX_MULTI_CVARS) {
+      return qfalse;
+    }
 
-	}
-	return qfalse; 	// bk001205 - LCC missing return value
+  }
+  return qfalse;  // bk001205 - LCC missing return value
 }
 
 
 
 qboolean ItemParse_addColorRange( itemDef_t *item, int handle ) {
-	colorRangeDef_t color;
-
-	if (PC_Float_Parse(handle, &color.low) &&
-		PC_Float_Parse(handle, &color.high) &&
-		PC_Color_Parse(handle, &color.color) ) {
-		if (item->numColors < MAX_COLOR_RANGES) {
-			memcpy(&item->colorRanges[item->numColors], &color, sizeof(color));
-			item->numColors++;
-		}
-		return qtrue;
-	}
-	return qfalse;
+  colorRangeDef_t color;
+
+  if (PC_Float_Parse(handle, &color.low) &&
+    PC_Float_Parse(handle, &color.high) &&
+    PC_Color_Parse(handle, &color.color) ) {
+    if (item->numColors < MAX_COLOR_RANGES) {
+      memcpy(&item->colorRanges[item->numColors], &color, sizeof(color));
+      item->numColors++;
+    }
+    return qtrue;
+  }
+  return qfalse;
 }
 
 qboolean ItemParse_ownerdrawFlag( itemDef_t *item, int handle ) {
-	int i;
-	if (!PC_Int_Parse(handle, &i)) {
-		return qfalse;
-	}
-	item->window.ownerDrawFlags |= i;
-	return qtrue;
+  int i;
+  if (!PC_Int_Parse(handle, &i)) {
+    return qfalse;
+  }
+  item->window.ownerDrawFlags |= i;
+  return qtrue;
 }
 
 qboolean ItemParse_enableCvar( itemDef_t *item, int handle ) {
-	if (PC_Script_Parse(handle, &item->enableCvar)) {
-		item->cvarFlags = CVAR_ENABLE;
-		return qtrue;
-	}
-	return qfalse;
+  if (PC_Script_Parse(handle, &item->enableCvar)) {
+    item->cvarFlags = CVAR_ENABLE;
+    return qtrue;
+  }
+  return qfalse;
 }
 
 qboolean ItemParse_disableCvar( itemDef_t *item, int handle ) {
-	if (PC_Script_Parse(handle, &item->enableCvar)) {
-		item->cvarFlags = CVAR_DISABLE;
-		return qtrue;
-	}
-	return qfalse;
+  if (PC_Script_Parse(handle, &item->enableCvar)) {
+    item->cvarFlags = CVAR_DISABLE;
+    return qtrue;
+  }
+  return qfalse;
 }
 
 qboolean ItemParse_showCvar( itemDef_t *item, int handle ) {
-	if (PC_Script_Parse(handle, &item->enableCvar)) {
-		item->cvarFlags = CVAR_SHOW;
-		return qtrue;
-	}
-	return qfalse;
+  if (PC_Script_Parse(handle, &item->enableCvar)) {
+    item->cvarFlags = CVAR_SHOW;
+    return qtrue;
+  }
+  return qfalse;
 }
 
 qboolean ItemParse_hideCvar( itemDef_t *item, int handle ) {
-	if (PC_Script_Parse(handle, &item->enableCvar)) {
-		item->cvarFlags = CVAR_HIDE;
-		return qtrue;
-	}
-	return qfalse;
+  if (PC_Script_Parse(handle, &item->enableCvar)) {
+    item->cvarFlags = CVAR_HIDE;
+    return qtrue;
+  }
+  return qfalse;
 }
 
 
 keywordHash_t itemParseKeywords[] = {
-	{"name", ItemParse_name, NULL},
-	{"text", ItemParse_text, NULL},
-	{"group", ItemParse_group, NULL},
-	{"asset_model", ItemParse_asset_model, NULL},
-	{"asset_shader", ItemParse_asset_shader, NULL},
-	{"model_origin", ItemParse_model_origin, NULL},
-	{"model_fovx", ItemParse_model_fovx, NULL},
-	{"model_fovy", ItemParse_model_fovy, NULL},
-	{"model_rotation", ItemParse_model_rotation, NULL},
-	{"model_angle", ItemParse_model_angle, NULL},
-	{"rect", ItemParse_rect, NULL},
-	{"style", ItemParse_style, NULL},
-	{"decoration", ItemParse_decoration, NULL},
-	{"notselectable", ItemParse_notselectable, NULL},
-	{"wrapped", ItemParse_wrapped, NULL},
-	{"autowrapped", ItemParse_autowrapped, NULL},
-	{"horizontalscroll", ItemParse_horizontalscroll, NULL},
-	{"type", ItemParse_type, NULL},
-	{"elementwidth", ItemParse_elementwidth, NULL},
-	{"elementheight", ItemParse_elementheight, NULL},
-	{"feeder", ItemParse_feeder, NULL},
-	{"elementtype", ItemParse_elementtype, NULL},
-	{"columns", ItemParse_columns, NULL},
-	{"border", ItemParse_border, NULL},
-	{"bordersize", ItemParse_bordersize, NULL},
-	{"visible", ItemParse_visible, NULL},
-	{"ownerdraw", ItemParse_ownerdraw, NULL},
-	{"align", ItemParse_align, NULL},
-	{"textalign", ItemParse_textalign, NULL},
-	{"textalignx", ItemParse_textalignx, NULL},
-	{"textaligny", ItemParse_textaligny, NULL},
-	{"textscale", ItemParse_textscale, NULL},
-	{"textstyle", ItemParse_textstyle, NULL},
-	{"backcolor", ItemParse_backcolor, NULL},
-	{"forecolor", ItemParse_forecolor, NULL},
-	{"bordercolor", ItemParse_bordercolor, NULL},
-	{"outlinecolor", ItemParse_outlinecolor, NULL},
-	{"background", ItemParse_background, NULL},
-	{"onFocus", ItemParse_onFocus, NULL},
-	{"leaveFocus", ItemParse_leaveFocus, NULL},
-	{"mouseEnter", ItemParse_mouseEnter, NULL},
-	{"mouseExit", ItemParse_mouseExit, NULL},
-	{"mouseEnterText", ItemParse_mouseEnterText, NULL},
-	{"mouseExitText", ItemParse_mouseExitText, NULL},
-	{"action", ItemParse_action, NULL},
-	{"special", ItemParse_special, NULL},
-	{"cvar", ItemParse_cvar, NULL},
-	{"maxChars", ItemParse_maxChars, NULL},
-	{"maxPaintChars", ItemParse_maxPaintChars, NULL},
-	{"focusSound", ItemParse_focusSound, NULL},
-	{"cvarFloat", ItemParse_cvarFloat, NULL},
-	{"cvarStrList", ItemParse_cvarStrList, NULL},
-	{"cvarFloatList", ItemParse_cvarFloatList, NULL},
-	{"addColorRange", ItemParse_addColorRange, NULL},
-	{"ownerdrawFlag", ItemParse_ownerdrawFlag, NULL},
-	{"enableCvar", ItemParse_enableCvar, NULL},
-	{"cvarTest", ItemParse_cvarTest, NULL},
-	{"disableCvar", ItemParse_disableCvar, NULL},
-	{"showCvar", ItemParse_showCvar, NULL},
-	{"hideCvar", ItemParse_hideCvar, NULL},
-	{"cinematic", ItemParse_cinematic, NULL},
-	{"doubleclick", ItemParse_doubleClick, NULL},
-	{NULL, voidFunction2, NULL}
+  {"name", ItemParse_name, NULL},
+  {"text", ItemParse_text, NULL},
+  {"group", ItemParse_group, NULL},
+  {"asset_model", ItemParse_asset_model, NULL},
+  {"asset_shader", ItemParse_asset_shader, NULL},
+  {"model_origin", ItemParse_model_origin, NULL},
+  {"model_fovx", ItemParse_model_fovx, NULL},
+  {"model_fovy", ItemParse_model_fovy, NULL},
+  {"model_rotation", ItemParse_model_rotation, NULL},
+  {"model_angle", ItemParse_model_angle, NULL},
+  {"rect", ItemParse_rect, NULL},
+  {"style", ItemParse_style, NULL},
+  {"decoration", ItemParse_decoration, NULL},
+  {"notselectable", ItemParse_notselectable, NULL},
+  {"wrapped", ItemParse_wrapped, NULL},
+  {"autowrapped", ItemParse_autowrapped, NULL},
+  {"horizontalscroll", ItemParse_horizontalscroll, NULL},
+  {"type", ItemParse_type, NULL},
+  {"elementwidth", ItemParse_elementwidth, NULL},
+  {"elementheight", ItemParse_elementheight, NULL},
+  {"feeder", ItemParse_feeder, NULL},
+  {"elementtype", ItemParse_elementtype, NULL},
+  {"columns", ItemParse_columns, NULL},
+  {"border", ItemParse_border, NULL},
+  {"bordersize", ItemParse_bordersize, NULL},
+  {"visible", ItemParse_visible, NULL},
+  {"ownerdraw", ItemParse_ownerdraw, NULL},
+  {"align", ItemParse_align, NULL},
+  {"textalign", ItemParse_textalign, NULL},
+  {"textalignx", ItemParse_textalignx, NULL},
+  {"textaligny", ItemParse_textaligny, NULL},
+  {"textscale", ItemParse_textscale, NULL},
+  {"textstyle", ItemParse_textstyle, NULL},
+  {"backcolor", ItemParse_backcolor, NULL},
+  {"forecolor", ItemParse_forecolor, NULL},
+  {"bordercolor", ItemParse_bordercolor, NULL},
+  {"outlinecolor", ItemParse_outlinecolor, NULL},
+  {"background", ItemParse_background, NULL},
+  {"onFocus", ItemParse_onFocus, NULL},
+  {"leaveFocus", ItemParse_leaveFocus, NULL},
+  {"mouseEnter", ItemParse_mouseEnter, NULL},
+  {"mouseExit", ItemParse_mouseExit, NULL},
+  {"mouseEnterText", ItemParse_mouseEnterText, NULL},
+  {"mouseExitText", ItemParse_mouseExitText, NULL},
+  {"action", ItemParse_action, NULL},
+  {"special", ItemParse_special, NULL},
+  {"cvar", ItemParse_cvar, NULL},
+  {"maxChars", ItemParse_maxChars, NULL},
+  {"maxPaintChars", ItemParse_maxPaintChars, NULL},
+  {"focusSound", ItemParse_focusSound, NULL},
+  {"cvarFloat", ItemParse_cvarFloat, NULL},
+  {"cvarStrList", ItemParse_cvarStrList, NULL},
+  {"cvarFloatList", ItemParse_cvarFloatList, NULL},
+  {"addColorRange", ItemParse_addColorRange, NULL},
+  {"ownerdrawFlag", ItemParse_ownerdrawFlag, NULL},
+  {"enableCvar", ItemParse_enableCvar, NULL},
+  {"cvarTest", ItemParse_cvarTest, NULL},
+  {"disableCvar", ItemParse_disableCvar, NULL},
+  {"showCvar", ItemParse_showCvar, NULL},
+  {"hideCvar", ItemParse_hideCvar, NULL},
+  {"cinematic", ItemParse_cinematic, NULL},
+  {"doubleclick", ItemParse_doubleClick, NULL},
+  {NULL, voidFunction2, NULL}
 };
 
 keywordHash_t *itemParseKeywordHash[KEYWORDHASH_SIZE];
@@ -5127,12 +5128,12 @@ Item_SetupKeywordHash
 ===============
 */
 void Item_SetupKeywordHash(void) {
-	int i;
+  int i;
 
-	memset(itemParseKeywordHash, 0, sizeof(itemParseKeywordHash));
-	for (i = 0; itemParseKeywords[i].keyword; i++) {
-		KeywordHash_Add(itemParseKeywordHash, &itemParseKeywords[i]);
-	}
+  memset(itemParseKeywordHash, 0, sizeof(itemParseKeywordHash));
+  for (i = 0; itemParseKeywords[i].keyword; i++) {
+    KeywordHash_Add(itemParseKeywordHash, &itemParseKeywords[i]);
+  }
 }
 
 /*
@@ -5141,55 +5142,55 @@ Item_Parse
 ===============
 */
 qboolean Item_Parse(int handle, itemDef_t *item) {
-	pc_token_t token;
-	keywordHash_t *key;
-
-
-	if (!trap_PC_ReadToken(handle, &token))
-		return qfalse;
-	if (*token.string != '{') {
-		return qfalse;
-	}
-	while ( 1 ) {
-		if (!trap_PC_ReadToken(handle, &token)) {
-			PC_SourceError(handle, "end of file inside menu item\n");
-			return qfalse;
-		}
-
-		if (*token.string == '}') {
-			return qtrue;
-		}
-
-		key = KeywordHash_Find(itemParseKeywordHash, token.string);
-		if (!key) {
-			PC_SourceError(handle, "unknown menu item keyword %s", token.string);
-			continue;
-		}
-		if ( !key->func(item, handle) ) {
-			PC_SourceError(handle, "couldn't parse menu item keyword %s", token.string);
-			return qfalse;
-		}
-	}
-	return qfalse; 	// bk001205 - LCC missing return value
+  pc_token_t token;
+  keywordHash_t *key;
+
+
+  if (!trap_PC_ReadToken(handle, &token))
+    return qfalse;
+  if (*token.string != '{') {
+    return qfalse;
+  }
+  while ( 1 ) {
+    if (!trap_PC_ReadToken(handle, &token)) {
+      PC_SourceError(handle, "end of file inside menu item\n");
+      return qfalse;
+    }
+
+    if (*token.string == '}') {
+      return qtrue;
+    }
+
+    key = KeywordHash_Find(itemParseKeywordHash, token.string);
+    if (!key) {
+      PC_SourceError(handle, "unknown menu item keyword %s", token.string);
+      continue;
+    }
+    if ( !key->func(item, handle) ) {
+      PC_SourceError(handle, "couldn't parse menu item keyword %s", token.string);
+      return qfalse;
+    }
+  }
+  return qfalse;  // bk001205 - LCC missing return value
 }
 
 
 // Item_InitControls
 // init's special control types
 void Item_InitControls(itemDef_t *item) {
-	if (item == NULL) {
-		return;
-	}
-	if (item->type == ITEM_TYPE_LISTBOX) {
-		listBoxDef_t *listPtr = (listBoxDef_t*)item->typeData;
-		item->cursorPos = 0;
-		if (listPtr) {
-			listPtr->cursorPos = 0;
-			listPtr->startPos = 0;
-			listPtr->endPos = 0;
-			listPtr->cursorPos = 0;
-		}
-	}
+  if (item == NULL) {
+    return;
+  }
+  if (item->type == ITEM_TYPE_LISTBOX) {
+    listBoxDef_t *listPtr = (listBoxDef_t*)item->typeData;
+    item->cursorPos = 0;
+    if (listPtr) {
+      listPtr->cursorPos = 0;
+      listPtr->startPos = 0;
+      listPtr->endPos = 0;
+      listPtr->cursorPos = 0;
+    }
+  }
 }
 
 /*
@@ -5199,325 +5200,325 @@ Menu Keyword Parse functions
 */
 
 qboolean MenuParse_font( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
-	if (!PC_String_Parse(handle, &menu->font)) {
-		return qfalse;
-	}
-	if (!DC->Assets.fontRegistered) {
-		DC->registerFont(menu->font, 48, &DC->Assets.textFont);
-		DC->Assets.fontRegistered = qtrue;
-	}
-	return qtrue;
+  menuDef_t *menu = (menuDef_t*)item;
+  if (!PC_String_Parse(handle, &menu->font)) {
+    return qfalse;
+  }
+  if (!DC->Assets.fontRegistered) {
+    DC->registerFont(menu->font, 48, &DC->Assets.textFont);
+    DC->Assets.fontRegistered = qtrue;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_name( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
-	if (!PC_String_Parse(handle, &menu->window.name)) {
-		return qfalse;
-	}
-	if (Q_stricmp(menu->window.name, "main") == 0) {
-		// default main as having focus
-		//menu->window.flags |= WINDOW_HASFOCUS;
-	}
-	return qtrue;
+  menuDef_t *menu = (menuDef_t*)item;
+  if (!PC_String_Parse(handle, &menu->window.name)) {
+    return qfalse;
+  }
+  if (Q_stricmp(menu->window.name, "main") == 0) {
+    // default main as having focus
+    //menu->window.flags |= WINDOW_HASFOCUS;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_fullscreen( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
-	if (!PC_Int_Parse(handle, (int*) &menu->fullScreen)) { // bk001206 - cast qboolean
-		return qfalse;
-	}
-	return qtrue;
+  menuDef_t *menu = (menuDef_t*)item;
+  if (!PC_Int_Parse(handle, (int*) &menu->fullScreen)) { // bk001206 - cast qboolean
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_rect( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
-	if (!PC_Rect_Parse(handle, &menu->window.rect)) {
-		return qfalse;
-	}
-	return qtrue;
+  menuDef_t *menu = (menuDef_t*)item;
+  if (!PC_Rect_Parse(handle, &menu->window.rect)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_style( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
-	if (!PC_Int_Parse(handle, &menu->window.style)) {
-		return qfalse;
-	}
-	return qtrue;
+  menuDef_t *menu = (menuDef_t*)item;
+  if (!PC_Int_Parse(handle, &menu->window.style)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_visible( itemDef_t *item, int handle ) {
-	int i;
-	menuDef_t *menu = (menuDef_t*)item;
+  int i;
+  menuDef_t *menu = (menuDef_t*)item;
 
-	if (!PC_Int_Parse(handle, &i)) {
-		return qfalse;
-	}
-	if (i) {
-		menu->window.flags |= WINDOW_VISIBLE;
-	}
-	return qtrue;
+  if (!PC_Int_Parse(handle, &i)) {
+    return qfalse;
+  }
+  if (i) {
+    menu->window.flags |= WINDOW_VISIBLE;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_onOpen( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
-	if (!PC_Script_Parse(handle, &menu->onOpen)) {
-		return qfalse;
-	}
-	return qtrue;
+  menuDef_t *menu = (menuDef_t*)item;
+  if (!PC_Script_Parse(handle, &menu->onOpen)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_onClose( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
-	if (!PC_Script_Parse(handle, &menu->onClose)) {
-		return qfalse;
-	}
-	return qtrue;
+  menuDef_t *menu = (menuDef_t*)item;
+  if (!PC_Script_Parse(handle, &menu->onClose)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_onESC( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
-	if (!PC_Script_Parse(handle, &menu->onESC)) {
-		return qfalse;
-	}
-	return qtrue;
+  menuDef_t *menu = (menuDef_t*)item;
+  if (!PC_Script_Parse(handle, &menu->onESC)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 
 
 qboolean MenuParse_border( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
-	if (!PC_Int_Parse(handle, &menu->window.border)) {
-		return qfalse;
-	}
-	return qtrue;
+  menuDef_t *menu = (menuDef_t*)item;
+  if (!PC_Int_Parse(handle, &menu->window.border)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_borderSize( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
-	if (!PC_Float_Parse(handle, &menu->window.borderSize)) {
-		return qfalse;
-	}
-	return qtrue;
+  menuDef_t *menu = (menuDef_t*)item;
+  if (!PC_Float_Parse(handle, &menu->window.borderSize)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_backcolor( itemDef_t *item, int handle ) {
-	int i;
-	float f;
-	menuDef_t *menu = (menuDef_t*)item;
+  int i;
+  float f;
+  menuDef_t *menu = (menuDef_t*)item;
 
-	for (i = 0; i < 4; i++) {
-		if (!PC_Float_Parse(handle, &f)) {
-			return qfalse;
-		}
-		menu->window.backColor[i]  = f;
-	}
-	return qtrue;
+  for (i = 0; i < 4; i++) {
+    if (!PC_Float_Parse(handle, &f)) {
+      return qfalse;
+    }
+    menu->window.backColor[i]  = f;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_forecolor( itemDef_t *item, int handle ) {
-	int i;
-	float f;
-	menuDef_t *menu = (menuDef_t*)item;
+  int i;
+  float f;
+  menuDef_t *menu = (menuDef_t*)item;
 
-	for (i = 0; i < 4; i++) {
-		if (!PC_Float_Parse(handle, &f)) {
-			return qfalse;
-		}
-		menu->window.foreColor[i]  = f;
-		menu->window.flags |= WINDOW_FORECOLORSET;
-	}
-	return qtrue;
+  for (i = 0; i < 4; i++) {
+    if (!PC_Float_Parse(handle, &f)) {
+      return qfalse;
+    }
+    menu->window.foreColor[i]  = f;
+    menu->window.flags |= WINDOW_FORECOLORSET;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_bordercolor( itemDef_t *item, int handle ) {
-	int i;
-	float f;
-	menuDef_t *menu = (menuDef_t*)item;
+  int i;
+  float f;
+  menuDef_t *menu = (menuDef_t*)item;
 
-	for (i = 0; i < 4; i++) {
-		if (!PC_Float_Parse(handle, &f)) {
-			return qfalse;
-		}
-		menu->window.borderColor[i]  = f;
-	}
-	return qtrue;
+  for (i = 0; i < 4; i++) {
+    if (!PC_Float_Parse(handle, &f)) {
+      return qfalse;
+    }
+    menu->window.borderColor[i]  = f;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_focuscolor( itemDef_t *item, int handle ) {
-	int i;
-	float f;
-	menuDef_t *menu = (menuDef_t*)item;
+  int i;
+  float f;
+  menuDef_t *menu = (menuDef_t*)item;
 
-	for (i = 0; i < 4; i++) {
-		if (!PC_Float_Parse(handle, &f)) {
-			return qfalse;
-		}
-		menu->focusColor[i]  = f;
-	}
-	return qtrue;
+  for (i = 0; i < 4; i++) {
+    if (!PC_Float_Parse(handle, &f)) {
+      return qfalse;
+    }
+    menu->focusColor[i]  = f;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_disablecolor( itemDef_t *item, int handle ) {
-	int i;
-	float f;
-	menuDef_t *menu = (menuDef_t*)item;
-	for (i = 0; i < 4; i++) {
-		if (!PC_Float_Parse(handle, &f)) {
-			return qfalse;
-		}
-		menu->disableColor[i]  = f;
-	}
-	return qtrue;
+  int i;
+  float f;
+  menuDef_t *menu = (menuDef_t*)item;
+  for (i = 0; i < 4; i++) {
+    if (!PC_Float_Parse(handle, &f)) {
+      return qfalse;
+    }
+    menu->disableColor[i]  = f;
+  }
+  return qtrue;
 }
 
 
 qboolean MenuParse_outlinecolor( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
-	if (!PC_Color_Parse(handle, &menu->window.outlineColor)){
-		return qfalse;
-	}
-	return qtrue;
+  menuDef_t *menu = (menuDef_t*)item;
+  if (!PC_Color_Parse(handle, &menu->window.outlineColor)){
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_background( itemDef_t *item, int handle ) {
-	const char *buff;
-	menuDef_t *menu = (menuDef_t*)item;
+  const char *buff;
+  menuDef_t *menu = (menuDef_t*)item;
 
-	if (!PC_String_Parse(handle, &buff)) {
-		return qfalse;
-	}
-	menu->window.background = DC->registerShaderNoMip(buff);
-	return qtrue;
+  if (!PC_String_Parse(handle, &buff)) {
+    return qfalse;
+  }
+  menu->window.background = DC->registerShaderNoMip(buff);
+  return qtrue;
 }
 
 qboolean MenuParse_cinematic( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
+  menuDef_t *menu = (menuDef_t*)item;
 
-	if (!PC_String_Parse(handle, &menu->window.cinematicName)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_String_Parse(handle, &menu->window.cinematicName)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_ownerdrawFlag( itemDef_t *item, int handle ) {
-	int i;
-	menuDef_t *menu = (menuDef_t*)item;
+  int i;
+  menuDef_t *menu = (menuDef_t*)item;
 
-	if (!PC_Int_Parse(handle, &i)) {
-		return qfalse;
-	}
-	menu->window.ownerDrawFlags |= i;
-	return qtrue;
+  if (!PC_Int_Parse(handle, &i)) {
+    return qfalse;
+  }
+  menu->window.ownerDrawFlags |= i;
+  return qtrue;
 }
 
 qboolean MenuParse_ownerdraw( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
+  menuDef_t *menu = (menuDef_t*)item;
 
-	if (!PC_Int_Parse(handle, &menu->window.ownerDraw)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Int_Parse(handle, &menu->window.ownerDraw)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 
 // decoration
 qboolean MenuParse_popup( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
-	menu->window.flags |= WINDOW_POPUP;
-	return qtrue;
+  menuDef_t *menu = (menuDef_t*)item;
+  menu->window.flags |= WINDOW_POPUP;
+  return qtrue;
 }
 
 
 qboolean MenuParse_outOfBounds( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
+  menuDef_t *menu = (menuDef_t*)item;
 
-	menu->window.flags |= WINDOW_OOB_CLICK;
-	return qtrue;
+  menu->window.flags |= WINDOW_OOB_CLICK;
+  return qtrue;
 }
 
 qboolean MenuParse_soundLoop( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
+  menuDef_t *menu = (menuDef_t*)item;
 
-	if (!PC_String_Parse(handle, &menu->soundName)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_String_Parse(handle, &menu->soundName)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_fadeClamp( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
+  menuDef_t *menu = (menuDef_t*)item;
 
-	if (!PC_Float_Parse(handle, &menu->fadeClamp)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Float_Parse(handle, &menu->fadeClamp)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 qboolean MenuParse_fadeAmount( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
+  menuDef_t *menu = (menuDef_t*)item;
 
-	if (!PC_Float_Parse(handle, &menu->fadeAmount)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Float_Parse(handle, &menu->fadeAmount)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 
 qboolean MenuParse_fadeCycle( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
+  menuDef_t *menu = (menuDef_t*)item;
 
-	if (!PC_Int_Parse(handle, &menu->fadeCycle)) {
-		return qfalse;
-	}
-	return qtrue;
+  if (!PC_Int_Parse(handle, &menu->fadeCycle)) {
+    return qfalse;
+  }
+  return qtrue;
 }
 
 
 qboolean MenuParse_itemDef( itemDef_t *item, int handle ) {
-	menuDef_t *menu = (menuDef_t*)item;
-	if (menu->itemCount < MAX_MENUITEMS) {
-		menu->items[menu->itemCount] = UI_Alloc(sizeof(itemDef_t));
-		Item_Init(menu->items[menu->itemCount]);
-		if (!Item_Parse(handle, menu->items[menu->itemCount])) {
-			return qfalse;
-		}
-		Item_InitControls(menu->items[menu->itemCount]);
-		menu->items[menu->itemCount++]->parent = menu;
-	}
-	return qtrue;
+  menuDef_t *menu = (menuDef_t*)item;
+  if (menu->itemCount < MAX_MENUITEMS) {
+    menu->items[menu->itemCount] = UI_Alloc(sizeof(itemDef_t));
+    Item_Init(menu->items[menu->itemCount]);
+    if (!Item_Parse(handle, menu->items[menu->itemCount])) {
+      return qfalse;
+    }
+    Item_InitControls(menu->items[menu->itemCount]);
+    menu->items[menu->itemCount++]->parent = menu;
+  }
+  return qtrue;
 }
 
 keywordHash_t menuParseKeywords[] = {
-	{"font", MenuParse_font, NULL},
-	{"name", MenuParse_name, NULL},
-	{"fullscreen", MenuParse_fullscreen, NULL},
-	{"rect", MenuParse_rect, NULL},
-	{"style", MenuParse_style, NULL},
-	{"visible", MenuParse_visible, NULL},
-	{"onOpen", MenuParse_onOpen, NULL},
-	{"onClose", MenuParse_onClose, NULL},
-	{"onESC", MenuParse_onESC, NULL},
-	{"border", MenuParse_border, NULL},
-	{"borderSize", MenuParse_borderSize, NULL},
-	{"backcolor", MenuParse_backcolor, NULL},
-	{"forecolor", MenuParse_forecolor, NULL},
-	{"bordercolor", MenuParse_bordercolor, NULL},
-	{"focuscolor", MenuParse_focuscolor, NULL},
-	{"disablecolor", MenuParse_disablecolor, NULL},
-	{"outlinecolor", MenuParse_outlinecolor, NULL},
-	{"background", MenuParse_background, NULL},
-	{"ownerdraw", MenuParse_ownerdraw, NULL},
-	{"ownerdrawFlag", MenuParse_ownerdrawFlag, NULL},
-	{"outOfBoundsClick", MenuParse_outOfBounds, NULL},
-	{"soundLoop", MenuParse_soundLoop, NULL},
-	{"itemDef", MenuParse_itemDef, NULL},
-	{"cinematic", MenuParse_cinematic, NULL},
-	{"popup", MenuParse_popup, NULL},
-	{"fadeClamp", MenuParse_fadeClamp, NULL},
-	{"fadeCycle", MenuParse_fadeCycle, NULL},
-	{"fadeAmount", MenuParse_fadeAmount, NULL},
-	{NULL, voidFunction2, NULL}
+  {"font", MenuParse_font, NULL},
+  {"name", MenuParse_name, NULL},
+  {"fullscreen", MenuParse_fullscreen, NULL},
+  {"rect", MenuParse_rect, NULL},
+  {"style", MenuParse_style, NULL},
+  {"visible", MenuParse_visible, NULL},
+  {"onOpen", MenuParse_onOpen, NULL},
+  {"onClose", MenuParse_onClose, NULL},
+  {"onESC", MenuParse_onESC, NULL},
+  {"border", MenuParse_border, NULL},
+  {"borderSize", MenuParse_borderSize, NULL},
+  {"backcolor", MenuParse_backcolor, NULL},
+  {"forecolor", MenuParse_forecolor, NULL},
+  {"bordercolor", MenuParse_bordercolor, NULL},
+  {"focuscolor", MenuParse_focuscolor, NULL},
+  {"disablecolor", MenuParse_disablecolor, NULL},
+  {"outlinecolor", MenuParse_outlinecolor, NULL},
+  {"background", MenuParse_background, NULL},
+  {"ownerdraw", MenuParse_ownerdraw, NULL},
+  {"ownerdrawFlag", MenuParse_ownerdrawFlag, NULL},
+  {"outOfBoundsClick", MenuParse_outOfBounds, NULL},
+  {"soundLoop", MenuParse_soundLoop, NULL},
+  {"itemDef", MenuParse_itemDef, NULL},
+  {"cinematic", MenuParse_cinematic, NULL},
+  {"popup", MenuParse_popup, NULL},
+  {"fadeClamp", MenuParse_fadeClamp, NULL},
+  {"fadeCycle", MenuParse_fadeCycle, NULL},
+  {"fadeAmount", MenuParse_fadeAmount, NULL},
+  {NULL, voidFunction2, NULL}
 };
 
 keywordHash_t *menuParseKeywordHash[KEYWORDHASH_SIZE];
@@ -5528,12 +5529,12 @@ Menu_SetupKeywordHash
 ===============
 */
 void Menu_SetupKeywordHash(void) {
-	int i;
+  int i;
 
-	memset(menuParseKeywordHash, 0, sizeof(menuParseKeywordHash));
-	for (i = 0; menuParseKeywords[i].keyword; i++) {
-		KeywordHash_Add(menuParseKeywordHash, &menuParseKeywords[i]);
-	}
+  memset(menuParseKeywordHash, 0, sizeof(menuParseKeywordHash));
+  for (i = 0; menuParseKeywords[i].keyword; i++) {
+    KeywordHash_Add(menuParseKeywordHash, &menuParseKeywords[i]);
+  }
 }
 
 /*
@@ -5542,38 +5543,38 @@ Menu_Parse
 ===============
 */
 qboolean Menu_Parse(int handle, menuDef_t *menu) {
-	pc_token_t token;
-	keywordHash_t *key;
-
-	if (!trap_PC_ReadToken(handle, &token))
-		return qfalse;
-	if (*token.string != '{') {
-		return qfalse;
-	}
+  pc_token_t token;
+  keywordHash_t *key;
+
+  if (!trap_PC_ReadToken(handle, &token))
+    return qfalse;
+  if (*token.string != '{') {
+    return qfalse;
+  }
     
-	while ( 1 ) {
-
-		memset(&token, 0, sizeof(pc_token_t));
-		if (!trap_PC_ReadToken(handle, &token)) {
-			PC_SourceError(handle, "end of file inside menu\n");
-			return qfalse;
-		}
-
-		if (*token.string == '}') {
-			return qtrue;
-		}
-
-		key = KeywordHash_Find(menuParseKeywordHash, token.string);
-		if (!key) {
-			PC_SourceError(handle, "unknown menu keyword %s", token.string);
-			continue;
-		}
-		if ( !key->func((itemDef_t*)menu, handle) ) {
-			PC_SourceError(handle, "couldn't parse menu keyword %s", token.string);
-			return qfalse;
-		}
-	}
-	return qfalse; 	// bk001205 - LCC missing return value
+  while ( 1 ) {
+
+    memset(&token, 0, sizeof(pc_token_t));
+    if (!trap_PC_ReadToken(handle, &token)) {
+      PC_SourceError(handle, "end of file inside menu\n");
+      return qfalse;
+    }
+
+    if (*token.string == '}') {
+      return qtrue;
+    }
+
+    key = KeywordHash_Find(menuParseKeywordHash, token.string);
+    if (!key) {
+      PC_SourceError(handle, "unknown menu keyword %s", token.string);
+      continue;
+    }
+    if ( !key->func((itemDef_t*)menu, handle) ) {
+      PC_SourceError(handle, "couldn't parse menu keyword %s", token.string);
+      return qfalse;
+    }
+  }
+  return qfalse;  // bk001205 - LCC missing return value
 }
 
 /*
@@ -5582,43 +5583,43 @@ Menu_New
 ===============
 */
 void Menu_New(int handle) {
-	menuDef_t *menu = &Menus[menuCount];
+  menuDef_t *menu = &Menus[menuCount];
 
-	if (menuCount < MAX_MENUS) {
-		Menu_Init(menu);
-		if (Menu_Parse(handle, menu)) {
-			Menu_PostParse(menu);
-			menuCount++;
-		}
-	}
+  if (menuCount < MAX_MENUS) {
+    Menu_Init(menu);
+    if (Menu_Parse(handle, menu)) {
+      Menu_PostParse(menu);
+      menuCount++;
+    }
+  }
 }
 
 int Menu_Count() {
-	return menuCount;
+  return menuCount;
 }
 
 void Menu_PaintAll() {
-	int i;
-	if (captureFunc) {
-		captureFunc(captureData);
-	}
+  int i;
+  if (captureFunc) {
+    captureFunc(captureData);
+  }
 
-	for (i = 0; i < Menu_Count(); i++) {
-		Menu_Paint(&Menus[i], qfalse);
-	}
+  for (i = 0; i < Menu_Count(); i++) {
+    Menu_Paint(&Menus[i], qfalse);
+  }
 
-	if (debugMode) {
-		vec4_t v = {1, 1, 1, 1};
-		DC->drawText(5, 25, .5, v, va("fps: %f", DC->FPS), 0, 0, 0);
-	}
+  if (debugMode) {
+    vec4_t v = {1, 1, 1, 1};
+    DC->drawText(5, 25, .5, v, va("fps: %f", DC->FPS), 0, 0, 0);
+  }
 }
 
 void Menu_Reset() {
-	menuCount = 0;
+  menuCount = 0;
 }
 
 displayContextDef_t *Display_GetContext() {
-	return DC;
+  return DC;
 }
  
 #ifndef MISSIONPACK // bk001206
@@ -5627,141 +5628,141 @@ static float captureY;
 #endif
 
 void *Display_CaptureItem(int x, int y) {
-	int i;
+  int i;
 
-	for (i = 0; i < menuCount; i++) {
-		// turn off focus each item
-		// menu->items[i].window.flags &= ~WINDOW_HASFOCUS;
-		if (Rect_ContainsPoint(&Menus[i].window.rect, x, y)) {
-			return &Menus[i];
-		}
-	}
-	return NULL;
+  for (i = 0; i < menuCount; i++) {
+    // turn off focus each item
+    // menu->items[i].window.flags &= ~WINDOW_HASFOCUS;
+    if (Rect_ContainsPoint(&Menus[i].window.rect, x, y)) {
+      return &Menus[i];
+    }
+  }
+  return NULL;
 }
 
 
 // FIXME: 
 qboolean Display_MouseMove(void *p, int x, int y) {
-	int i;
-	menuDef_t *menu = p;
+  int i;
+  menuDef_t *menu = p;
 
-	if (menu == NULL) {
+  if (menu == NULL) {
     menu = Menu_GetFocused();
-		if (menu) {
-			if (menu->window.flags & WINDOW_POPUP) {
-				Menu_HandleMouseMove(menu, x, y);
-				return qtrue;
-			}
-		}
-		for (i = 0; i < menuCount; i++) {
-			Menu_HandleMouseMove(&Menus[i], x, y);
-		}
-	} else {
-		menu->window.rect.x += x;
-		menu->window.rect.y += y;
-		Menu_UpdatePosition(menu);
-	}
- 	return qtrue;
+    if (menu) {
+      if (menu->window.flags & WINDOW_POPUP) {
+        Menu_HandleMouseMove(menu, x, y);
+        return qtrue;
+      }
+    }
+    for (i = 0; i < menuCount; i++) {
+      Menu_HandleMouseMove(&Menus[i], x, y);
+    }
+  } else {
+    menu->window.rect.x += x;
+    menu->window.rect.y += y;
+    Menu_UpdatePosition(menu);
+  }
+  return qtrue;
 
 }
 
 int Display_CursorType(int x, int y) {
-	int i;
-	for (i = 0; i < menuCount; i++) {
-		rectDef_t r2;
-		r2.x = Menus[i].window.rect.x - 3;
-		r2.y = Menus[i].window.rect.y - 3;
-		r2.w = r2.h = 7;
-		if (Rect_ContainsPoint(&r2, x, y)) {
-			return CURSOR_SIZER;
-		}
-	}
-	return CURSOR_ARROW;
+  int i;
+  for (i = 0; i < menuCount; i++) {
+    rectDef_t r2;
+    r2.x = Menus[i].window.rect.x - 3;
+    r2.y = Menus[i].window.rect.y - 3;
+    r2.w = r2.h = 7;
+    if (Rect_ContainsPoint(&r2, x, y)) {
+      return CURSOR_SIZER;
+    }
+  }
+  return CURSOR_ARROW;
 }
 
 
 void Display_HandleKey(int key, qboolean down, int x, int y) {
-	menuDef_t *menu = Display_CaptureItem(x, y);
-	if (menu == NULL) {  
-		menu = Menu_GetFocused();
-	}
-	if (menu) {
-		Menu_HandleKey(menu, key, down );
-	}
+  menuDef_t *menu = Display_CaptureItem(x, y);
+  if (menu == NULL) {  
+    menu = Menu_GetFocused();
+  }
+  if (menu) {
+    Menu_HandleKey(menu, key, down );
+  }
 }
 
 static void Window_CacheContents(windowDef_t *window) {
-	if (window) {
-		if (window->cinematicName) {
-			int cin = DC->playCinematic(window->cinematicName, 0, 0, 0, 0);
-			DC->stopCinematic(cin);
-		}
-	}
+  if (window) {
+    if (window->cinematicName) {
+      int cin = DC->playCinematic(window->cinematicName, 0, 0, 0, 0);
+      DC->stopCinematic(cin);
+    }
+  }
 }
 
 
 static void Item_CacheContents(itemDef_t *item) {
-	if (item) {
-		Window_CacheContents(&item->window);
-	}
+  if (item) {
+    Window_CacheContents(&item->window);
+  }
 
 }
 
 static void Menu_CacheContents(menuDef_t *menu) {
-	if (menu) {
-		int i;
-		Window_CacheContents(&menu->window);
-		for (i = 0; i < menu->itemCount; i++) {
-			Item_CacheContents(menu->items[i]);
-		}
+  if (menu) {
+    int i;
+    Window_CacheContents(&menu->window);
+    for (i = 0; i < menu->itemCount; i++) {
+      Item_CacheContents(menu->items[i]);
+    }
 
-		if (menu->soundName && *menu->soundName) {
-			DC->registerSound(menu->soundName, qfalse);
-		}
-	}
+    if (menu->soundName && *menu->soundName) {
+      DC->registerSound(menu->soundName, qfalse);
+    }
+  }
 
 }
 
 void Display_CacheAll() {
-	int i;
-	for (i = 0; i < menuCount; i++) {
-		Menu_CacheContents(&Menus[i]);
-	}
+  int i;
+  for (i = 0; i < menuCount; i++) {
+    Menu_CacheContents(&Menus[i]);
+  }
 }
 
 
 static qboolean Menu_OverActiveItem(menuDef_t *menu, float x, float y) {
- 	if (menu && menu->window.flags & (WINDOW_VISIBLE | WINDOW_FORCED)) {
-		if (Rect_ContainsPoint(&menu->window.rect, x, y)) {
-			int i;
-			for (i = 0; i < menu->itemCount; i++) {
-				// turn off focus each item
-				// menu->items[i].window.flags &= ~WINDOW_HASFOCUS;
-
-				if (!(menu->items[i]->window.flags & (WINDOW_VISIBLE | WINDOW_FORCED))) {
-					continue;
-				}
-
-				if (menu->items[i]->window.flags & WINDOW_DECORATION) {
-					continue;
-				}
-
-				if (Rect_ContainsPoint(&menu->items[i]->window.rect, x, y)) {
-					itemDef_t *overItem = menu->items[i];
-					if (overItem->type == ITEM_TYPE_TEXT && overItem->text) {
-						if (Rect_ContainsPoint(Item_CorrectedTextRect(overItem), x, y)) {
-							return qtrue;
-						} else {
-							continue;
-						}
-					} else {
-						return qtrue;
-					}
-				}
-			}
-
-		}
-	}
-	return qfalse;
+  if (menu && menu->window.flags & (WINDOW_VISIBLE | WINDOW_FORCED)) {
+    if (Rect_ContainsPoint(&menu->window.rect, x, y)) {
+      int i;
+      for (i = 0; i < menu->itemCount; i++) {
+        // turn off focus each item
+        // menu->items[i].window.flags &= ~WINDOW_HASFOCUS;
+
+        if (!(menu->items[i]->window.flags & (WINDOW_VISIBLE | WINDOW_FORCED))) {
+          continue;
+        }
+
+        if (menu->items[i]->window.flags & WINDOW_DECORATION) {
+          continue;
+        }
+
+        if (Rect_ContainsPoint(&menu->items[i]->window.rect, x, y)) {
+          itemDef_t *overItem = menu->items[i];
+          if (overItem->type == ITEM_TYPE_TEXT && overItem->text) {
+            if (Rect_ContainsPoint(Item_CorrectedTextRect(overItem), x, y)) {
+              return qtrue;
+            } else {
+              continue;
+            }
+          } else {
+            return qtrue;
+          }
+        }
+      }
+
+    }
+  }
+  return qfalse;
 }
 
diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu
index b93a9fb7..469d7f76 100644
--- a/ui/ingame_options.menu
+++ b/ui/ingame_options.menu
@@ -460,7 +460,7 @@
       type ITEM_TYPE_YESNO
       text "Always Run:"
       cvar "cl_run"
-      rect 96 70 192 15
+      rect 96 65 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -479,7 +479,24 @@
       type ITEM_TYPE_BIND
       text "Run / Walk:"
       cvar "+speed"
-      rect 96 85 192 15
+      rect 96 80 192 15
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 90
+      maxPaintChars 20
+      textaligny 12
+      textscale .25        
+      forecolor 1 1 1 1
+      visible 0 
+    }
+
+    itemDef
+    {
+      name move
+      group optionsGrp
+      type ITEM_TYPE_BIND
+      text "Sprint:"
+      cvar "boost"
+      rect 96 95 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -496,7 +513,7 @@
       type ITEM_TYPE_BIND
       text "Forward:"
       cvar "+forward"
-      rect 96 100 192 15
+      rect 96 110 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -515,7 +532,7 @@
       type ITEM_TYPE_BIND
       text "Backpedal:"
       cvar "+back"
-      rect 96 115 192 15
+      rect 96 125 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -534,7 +551,7 @@
       type ITEM_TYPE_BIND
       text "Move Left:"
       cvar "+moveleft"
-      rect 96 130 192 15
+      rect 96 140 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -553,7 +570,7 @@
       type ITEM_TYPE_BIND
       text "Move Right:"
       cvar "+moveright"
-      rect 96 145 192 15
+      rect 96 155 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -572,7 +589,7 @@
       type ITEM_TYPE_BIND
       text "Jump:"
       cvar "+moveup"
-      rect 96 160 192 15
+      rect 96 170 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -591,7 +608,7 @@
       type ITEM_TYPE_BIND
       text "Crouch:"
       cvar "+movedown"
-      rect 96 175 192 15
+      rect 96 185 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -610,7 +627,7 @@
       type ITEM_TYPE_BIND
       text "Turn Left:"
       cvar "+left"
-      rect 96 190 192 15
+      rect 96 200 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -629,7 +646,7 @@
       type ITEM_TYPE_BIND
       text "Turn Right:"
       cvar "+right"
-      rect 96 205 192 15
+      rect 96 215 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -648,7 +665,7 @@
       type ITEM_TYPE_BIND
       text "Strafe:"
       cvar "+strafe"
-      rect 96 220 192 15
+      rect 96 230 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20