vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Added FLAC music playback style to force for those files.

Browse source
This commit is contained in:
Marco Cawthorne 2020-03-26 23:36:54 +01:00
parent 82d9027873
commit dd16fd1684
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/client/music.c
View file

@ -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 */

1
src/server/valve/client.c
View file

@ -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;