From 4a66a9d364d2826eee952baf698bfd947794dc28 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Wed, 17 Mar 2021 16:17:17 +0100
Subject: [PATCH] Client: offset the radar and weaponselect by a fair bit so we
 don't overlap

---
 src/client/hud.qc              | 2 +-
 src/client/hud_weaponselect.qc | 2 +-
 src/client/radar.qc            | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/client/hud.qc b/src/client/hud.qc
index 91cdc28..0c11895 100644
--- a/src/client/hud.qc
+++ b/src/client/hud.qc
@@ -670,13 +670,13 @@ HUD_Draw(void)
 		return;
 	}
 
+	Radar_Draw();
 	HUD_DrawNotify();
 	HUD_DrawHealth();
 	HUD_DrawArmor();
 	HUD_DrawZones();
 	HUD_DrawProgress();
 	HUD_DrawFlashlight();
-	Radar_Draw();
 	Damage_Draw();
 }
 
diff --git a/src/client/hud_weaponselect.qc b/src/client/hud_weaponselect.qc
index 01bd0d4..ae15230 100644
--- a/src/client/hud_weaponselect.qc
+++ b/src/client/hud_weaponselect.qc
@@ -189,7 +189,7 @@ HUD_DrawWeaponSelect(void)
 		return;
 	}
 
-	vector vecPos = g_hudmins + [16,16];
+	vector vecPos = g_hudmins + [128+32,16];
 
 	int b;
 	int wantslot = g_weapons[pSeat->m_iHUDWeaponSelected].slot;
diff --git a/src/client/radar.qc b/src/client/radar.qc
index 0052333..7fa21e7 100644
--- a/src/client/radar.qc
+++ b/src/client/radar.qc
@@ -27,7 +27,9 @@ Radar_Init(void)
 void
 Radar_Draw(void)
 {
-	drawpic(g_hudmins, g_cs_radar, [128,128], [1,1,1], 0.25f, DRAWFLAG_ADDITIVE);
+	vector radpos = g_hudmins + [16,16];
+
+	drawpic(radpos, g_cs_radar, [128,128], [1,1,1], 0.25f, DRAWFLAG_ADDITIVE);
 
 	for (entity a = world; (a = find(a, ::classname, "player"));) {
 		vector color;
@@ -61,7 +63,7 @@ Radar_Draw(void)
 		matrix[2] = 0;
 
 		/* we need to fit 1024 in-game units into the 64px radar image */
-		vector apos = g_hudmins + [62,62] + (matrix * (64/CSRADAR_DISTANCE));
+		vector apos = radpos + [62,62] + (matrix * (64/CSRADAR_DISTANCE));
 
 		if (getplayerkeyfloat(a.entnum-1, "*team") == TEAM_CT)
 			color = [115, 155, 205] / 255;