From b2ef0db0180f6f33ffe3953a99e7d7e34e39b8b0 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Tue, 7 Apr 2020 15:02:36 +0200
Subject: [PATCH] Fix misc warnings.

---
 src/client/cstrike/crosshair.c  | 2 +-
 src/menu-fn/m_intro.cpp         | 5 +++--
 src/menu-fn/w_pictureswitch.cpp | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/client/cstrike/crosshair.c b/src/client/cstrike/crosshair.c
index 31044e5c..6976f451 100644
--- a/src/client/cstrike/crosshair.c
+++ b/src/client/cstrike/crosshair.c
@@ -103,7 +103,7 @@ Cstrike_DrawScope(void)
 
 	// Border scale to fit the screen
 	scope_scale = g_hudres[1] / 480;
-	scope_offset = g_hudmins + (g_hudres[0] / 2) - ((640 * scope_scale) / 2);
+	scope_offset = g_hudmins[0] + (g_hudres[0] / 2) - ((640 * scope_scale) / 2);
 
 	// Type 1 Border... more coming soon?
 	Cstrike_ScopePic([0,0], [192,112], "sprites/top_left.spr_0.tga");
diff --git a/src/menu-fn/m_intro.cpp b/src/menu-fn/m_intro.cpp
index 38c638fe..754ea40a 100644
--- a/src/menu-fn/m_intro.cpp
+++ b/src/menu-fn/m_intro.cpp
@@ -32,20 +32,21 @@ void m_intro_skip(void)
 
 void m_intro_draw(void)
 {
+	float alpha;
 	if (clientstate() == 2) {
 		g_intro_progress = INTRO_TIME;
 		g_intro_stage = INTRO_DONE;
 	}
 
 	if (g_intro_progress > 7.0f) {
-		float alpha = (8 - g_intro_progress);
+		alpha = (8 - g_intro_progress);
 		drawfill([0,0], [g_vidsize[0],g_vidsize[1]], [1,1,1], alpha);
 		
 		if (g_intro_stage != INTRO_FADETOMENU) {
 			g_intro_stage = INTRO_FADETOMENU;
 		}
 	} else if (g_intro_progress > 5.0f) {
-		float alpha = (6 - g_intro_progress);
+		alpha = (6 - g_intro_progress);
 		drawpic([g_menuofs[0],g_menuofs[1]], g_bmp[SPLASH8BIT],
 				[640,480], [1,1,1], 1.0f, 0);
 		drawfill([0,0], [g_vidsize[0],g_vidsize[1]], [1,1,1], 1.0 - alpha);
diff --git a/src/menu-fn/w_pictureswitch.cpp b/src/menu-fn/w_pictureswitch.cpp
index 22b1059b..1d3d8237 100644
--- a/src/menu-fn/w_pictureswitch.cpp
+++ b/src/menu-fn/w_pictureswitch.cpp
@@ -64,7 +64,6 @@ void CPictureSwitch::Draw(void)
 
 void CPictureSwitch::Input(float type, float x, float y, float devid)
 {
-	int clickPrev, clickNext;
 	m_hoverPrev = Util_CheckMouse(m_x+3, m_y+m_size[1]-16, m_size[0]/2, 12);
 	m_hoverNext = Util_CheckMouse(m_x+m_size[0]-4-(m_size[0]/2), m_y+m_size[1]-16, m_size[0]/2, 12);