From dd16fd1684831f5b38b42ac7891cd918f8cf2a29 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Thu, 26 Mar 2020 23:36:54 +0100
Subject: [PATCH] Added FLAC music playback style to force for those files.

---
 src/client/music.c        | 11 ++++++++---
 src/server/valve/client.c |  1 -
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/client/music.c b/src/client/music.c
index d4c3fba7..45c5866b 100644
--- a/src/client/music.c
+++ b/src/client/music.c
@@ -17,18 +17,21 @@
 /* we're forced to support a few different paths */
 enum
 {
-	MUSIC_CDSTYLE,
+	MUSIC_AUTO,
+	MUSIC_FLAC,
 	MUSIC_STEAMHL
 };
 
-var int autocvar_cl_musicstyle = MUSIC_CDSTYLE;
+var int autocvar_cl_musicstyle = MUSIC_AUTO;
 
 /* some installs may have the music in media/, others may be in music/ */
 string
 Music_GetPath(int id)
 {
-	if (autocvar_cl_musicstyle == MUSIC_CDSTYLE) {
+	if (autocvar_cl_musicstyle == MUSIC_AUTO) {
 		return sprintf("%i", id);
+	} else if (autocvar_cl_musicstyle == MUSIC_FLAC) {
+		return sprintf("music/track%02i.flac", id);
 	} else if (autocvar_cl_musicstyle == MUSIC_STEAMHL) {
 		/* this doesn't happen often enough for it to be in RAM all the time */
 		switch (id) {
@@ -115,6 +118,8 @@ Music_GetPath(int id)
 			break;
 		}
 	}
+
+	return "";
 }
 
 /* EV_MUSICTRACK */
diff --git a/src/server/valve/client.c b/src/server/valve/client.c
index a47b0d8e..b91ea7ca 100644
--- a/src/server/valve/client.c
+++ b/src/server/valve/client.c
@@ -164,7 +164,6 @@ Game_RunClientCommand(void)
 void
 Game_PutClientInServer(player pl)
 {
-	entity spot;
 	pl.classname = "player";
 	pl.health = pl.max_health = 100;
 	pl.takedamage = DAMAGE_YES;