From 1059d56e854deb680699414f22f3e86294e4feb6 Mon Sep 17 00:00:00 2001
From: Harry Young <hendrik.gerritzen@googlemail.com>
Date: Tue, 13 Aug 2013 01:07:02 +0200
Subject: [PATCH] More stuff tuned

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
---
 code/ui/ui_main.c     | 6 +-----
 code/ui/ui_qmenu.c    | 4 ++--
 code/ui/ui_syscalls.c | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/code/ui/ui_main.c b/code/ui/ui_main.c
index 67bf7a0..1cba28d 100644
--- a/code/ui/ui_main.c
+++ b/code/ui/ui_main.c
@@ -573,11 +573,7 @@ int UI_GetAnim ( int anim, int weapon, qboolean upper )
 				//1 handed weapon - "phaser"
 				case WP_5:
 				case WP_10:
-					if (upper){
-						return BOTH_STAND1; //TORSO_WEAPONIDLE1
-					} else {
-						return BOTH_STAND1;
-					}
+					return BOTH_STAND1; 
 					break;
 				//Generic tools - "everything else"
 				case WP_4:
diff --git a/code/ui/ui_qmenu.c b/code/ui/ui_qmenu.c
index 5c97e15..93a6608 100644
--- a/code/ui/ui_qmenu.c
+++ b/code/ui/ui_qmenu.c
@@ -77,7 +77,7 @@ Text_Init
 */
 static void Text_Init( menutext_s *t )
 {
-	int		x,y,w,h,lines;
+	int		x,y,w=0,h;
 	char	buff[512];	
 	char	buff2[512];	
 	char	buff3[512];	
@@ -196,7 +196,7 @@ static void Text_Init( menutext_s *t )
 		y = t->generic.y;
 
 
-		lines = 0;
+		int lines = 0;
 		if (buff2[0] != '\0')
 		{
 			++lines;
diff --git a/code/ui/ui_syscalls.c b/code/ui/ui_syscalls.c
index 117136b..f5f3535 100644
--- a/code/ui/ui_syscalls.c
+++ b/code/ui/ui_syscalls.c
@@ -51,9 +51,9 @@ void trap_Cvar_Set( const char *var_name, const char *value ) {
 }
 
 float trap_Cvar_VariableValue( const char *var_name ) {
-	int temp;
+	float temp;
 	temp = syscall( UI_CVAR_VARIABLEVALUE, var_name );
-	return (*(float*)&temp);
+	return temp;
 }
 
 void trap_Cvar_VariableStringBuffer( const char *var_name, char *buffer, int bufsize ) {