X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cd_shared.c;h=3eee8510b7884ff247eef2f5e533abde2084f283;hb=a51a70c2254b27a68e5fe74cc5985b02dc36e1e9;hp=fdeff89bad5488f023e4424c91fe8f7465aad1eb;hpb=c38d0d2d6409d9b3174b6cf04f1bd09694cbfc81;p=xonotic%2Fdarkplaces.git diff --git a/cd_shared.c b/cd_shared.c index fdeff89b..3eee8510 100644 --- a/cd_shared.c +++ b/cd_shared.c @@ -25,64 +25,64 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "sound.h" // used by menu to ghost CD audio slider -cvar_t cdaudioinitialized = {CVAR_READONLY,"cdaudioinitialized","0","indicates if CD Audio system is active"}; +cvar_t cdaudioinitialized = {CVAR_CLIENT | CVAR_READONLY,"cdaudioinitialized","0","indicates if CD Audio system is active"}; #define MAX_PLAYLISTS 10 int music_playlist_active = -1; int music_playlist_playing = 0; // 0 = not playing, 1 = playing, -1 = tried and failed -cvar_t music_playlist_index = {0, "music_playlist_index", "-1", "selects which of the music_playlist_ variables is the active one, -1 disables playlists"}; +cvar_t music_playlist_index = {CVAR_CLIENT, "music_playlist_index", "-1", "selects which of the music_playlist_ variables is the active one, -1 disables playlists"}; cvar_t music_playlist_list[MAX_PLAYLISTS] = { - {0, "music_playlist_list0", "", "list of tracks to play"}, - {0, "music_playlist_list1", "", "list of tracks to play"}, - {0, "music_playlist_list2", "", "list of tracks to play"}, - {0, "music_playlist_list3", "", "list of tracks to play"}, - {0, "music_playlist_list4", "", "list of tracks to play"}, - {0, "music_playlist_list5", "", "list of tracks to play"}, - {0, "music_playlist_list6", "", "list of tracks to play"}, - {0, "music_playlist_list7", "", "list of tracks to play"}, - {0, "music_playlist_list8", "", "list of tracks to play"}, - {0, "music_playlist_list9", "", "list of tracks to play"} + {CVAR_CLIENT, "music_playlist_list0", "", "list of tracks to play"}, + {CVAR_CLIENT, "music_playlist_list1", "", "list of tracks to play"}, + {CVAR_CLIENT, "music_playlist_list2", "", "list of tracks to play"}, + {CVAR_CLIENT, "music_playlist_list3", "", "list of tracks to play"}, + {CVAR_CLIENT, "music_playlist_list4", "", "list of tracks to play"}, + {CVAR_CLIENT, "music_playlist_list5", "", "list of tracks to play"}, + {CVAR_CLIENT, "music_playlist_list6", "", "list of tracks to play"}, + {CVAR_CLIENT, "music_playlist_list7", "", "list of tracks to play"}, + {CVAR_CLIENT, "music_playlist_list8", "", "list of tracks to play"}, + {CVAR_CLIENT, "music_playlist_list9", "", "list of tracks to play"} }; cvar_t music_playlist_current[MAX_PLAYLISTS] = { - {0, "music_playlist_current0", "0", "current track index to play in list"}, - {0, "music_playlist_current1", "0", "current track index to play in list"}, - {0, "music_playlist_current2", "0", "current track index to play in list"}, - {0, "music_playlist_current3", "0", "current track index to play in list"}, - {0, "music_playlist_current4", "0", "current track index to play in list"}, - {0, "music_playlist_current5", "0", "current track index to play in list"}, - {0, "music_playlist_current6", "0", "current track index to play in list"}, - {0, "music_playlist_current7", "0", "current track index to play in list"}, - {0, "music_playlist_current8", "0", "current track index to play in list"}, - {0, "music_playlist_current9", "0", "current track index to play in list"}, + {CVAR_CLIENT, "music_playlist_current0", "0", "current track index to play in list"}, + {CVAR_CLIENT, "music_playlist_current1", "0", "current track index to play in list"}, + {CVAR_CLIENT, "music_playlist_current2", "0", "current track index to play in list"}, + {CVAR_CLIENT, "music_playlist_current3", "0", "current track index to play in list"}, + {CVAR_CLIENT, "music_playlist_current4", "0", "current track index to play in list"}, + {CVAR_CLIENT, "music_playlist_current5", "0", "current track index to play in list"}, + {CVAR_CLIENT, "music_playlist_current6", "0", "current track index to play in list"}, + {CVAR_CLIENT, "music_playlist_current7", "0", "current track index to play in list"}, + {CVAR_CLIENT, "music_playlist_current8", "0", "current track index to play in list"}, + {CVAR_CLIENT, "music_playlist_current9", "0", "current track index to play in list"}, }; cvar_t music_playlist_random[MAX_PLAYLISTS] = { - {0, "music_playlist_random0", "0", "enables random play order if 1, 0 is sequential play"}, - {0, "music_playlist_random1", "0", "enables random play order if 1, 0 is sequential play"}, - {0, "music_playlist_random2", "0", "enables random play order if 1, 0 is sequential play"}, - {0, "music_playlist_random3", "0", "enables random play order if 1, 0 is sequential play"}, - {0, "music_playlist_random4", "0", "enables random play order if 1, 0 is sequential play"}, - {0, "music_playlist_random5", "0", "enables random play order if 1, 0 is sequential play"}, - {0, "music_playlist_random6", "0", "enables random play order if 1, 0 is sequential play"}, - {0, "music_playlist_random7", "0", "enables random play order if 1, 0 is sequential play"}, - {0, "music_playlist_random8", "0", "enables random play order if 1, 0 is sequential play"}, - {0, "music_playlist_random9", "0", "enables random play order if 1, 0 is sequential play"}, + {CVAR_CLIENT, "music_playlist_random0", "0", "enables random play order if 1, 0 is sequential play"}, + {CVAR_CLIENT, "music_playlist_random1", "0", "enables random play order if 1, 0 is sequential play"}, + {CVAR_CLIENT, "music_playlist_random2", "0", "enables random play order if 1, 0 is sequential play"}, + {CVAR_CLIENT, "music_playlist_random3", "0", "enables random play order if 1, 0 is sequential play"}, + {CVAR_CLIENT, "music_playlist_random4", "0", "enables random play order if 1, 0 is sequential play"}, + {CVAR_CLIENT, "music_playlist_random5", "0", "enables random play order if 1, 0 is sequential play"}, + {CVAR_CLIENT, "music_playlist_random6", "0", "enables random play order if 1, 0 is sequential play"}, + {CVAR_CLIENT, "music_playlist_random7", "0", "enables random play order if 1, 0 is sequential play"}, + {CVAR_CLIENT, "music_playlist_random8", "0", "enables random play order if 1, 0 is sequential play"}, + {CVAR_CLIENT, "music_playlist_random9", "0", "enables random play order if 1, 0 is sequential play"}, }; cvar_t music_playlist_sampleposition[MAX_PLAYLISTS] = { - {0, "music_playlist_sampleposition0", "-1", "resume position for track, -1 restarts every time"}, - {0, "music_playlist_sampleposition1", "-1", "resume position for track, -1 restarts every time"}, - {0, "music_playlist_sampleposition2", "-1", "resume position for track, -1 restarts every time"}, - {0, "music_playlist_sampleposition3", "-1", "resume position for track, -1 restarts every time"}, - {0, "music_playlist_sampleposition4", "-1", "resume position for track, -1 restarts every time"}, - {0, "music_playlist_sampleposition5", "-1", "resume position for track, -1 restarts every time"}, - {0, "music_playlist_sampleposition6", "-1", "resume position for track, -1 restarts every time"}, - {0, "music_playlist_sampleposition7", "-1", "resume position for track, -1 restarts every time"}, - {0, "music_playlist_sampleposition8", "-1", "resume position for track, -1 restarts every time"}, - {0, "music_playlist_sampleposition9", "-1", "resume position for track, -1 restarts every time"}, + {CVAR_CLIENT, "music_playlist_sampleposition0", "-1", "resume position for track, -1 restarts every time"}, + {CVAR_CLIENT, "music_playlist_sampleposition1", "-1", "resume position for track, -1 restarts every time"}, + {CVAR_CLIENT, "music_playlist_sampleposition2", "-1", "resume position for track, -1 restarts every time"}, + {CVAR_CLIENT, "music_playlist_sampleposition3", "-1", "resume position for track, -1 restarts every time"}, + {CVAR_CLIENT, "music_playlist_sampleposition4", "-1", "resume position for track, -1 restarts every time"}, + {CVAR_CLIENT, "music_playlist_sampleposition5", "-1", "resume position for track, -1 restarts every time"}, + {CVAR_CLIENT, "music_playlist_sampleposition6", "-1", "resume position for track, -1 restarts every time"}, + {CVAR_CLIENT, "music_playlist_sampleposition7", "-1", "resume position for track, -1 restarts every time"}, + {CVAR_CLIENT, "music_playlist_sampleposition8", "-1", "resume position for track, -1 restarts every time"}, + {CVAR_CLIENT, "music_playlist_sampleposition9", "-1", "resume position for track, -1 restarts every time"}, }; static qboolean wasPlaying = false; @@ -570,8 +570,7 @@ int CDAudio_Init (void) Cvar_RegisterVariable(&music_playlist_sampleposition[i]); } - Cmd_AddCommand(&cmd_client, "cd", CD_f, "execute a CD drive command (cd on/off/reset/remap/close/play/loop/stop/pause/resume/eject/info) - use cd by itself for usage"); - Cmd_AddCommand(&cmd_clientfromserver, "cd", CD_f, "execute a CD drive command (cd on/off/reset/remap/close/play/loop/stop/pause/resume/eject/info) - use cd by itself for usage"); + Cmd_AddCommand(CMD_CLIENT | CMD_CLIENT_FROM_SERVER, "cd", CD_f, "execute a CD drive command (cd on/off/reset/remap/close/play/loop/stop/pause/resume/eject/info) - use cd by itself for usage"); return 0; }