nephatrine/kyuii-engine
nephatrine
/
kyuii-engine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move download cvars into common module

This commit is contained in:
Daniel Wolf 2021-02-22 12:00:46 -05:00
parent b90384272a
commit 2009a27724
Signed by: nephatrine
GPG Key ID: F402AF4822FB01F5
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qcommon/common.c
View File

@ -45,6 +45,13 @@ cvar_t *logfile_active; // 1 = buffer log, 2 = flush after each print
cvar_t *showtrace;
cvar_t *dedicated;
//NEPHATRINE: Moved these from sv_main since also needed by client.
cvar_t *allow_download;
cvar_t *allow_download_players;
cvar_t *allow_download_models;
cvar_t *allow_download_sounds;
cvar_t *allow_download_maps;
FILE *logfile;
int server_state;
@ -1459,6 +1466,13 @@ void Qcommon_Init (int argc, char **argv)
dedicated = Cvar_Get ("dedicated", "0", CVAR_NOSET);
#endif
//NEPHATRINE: Moved these from sv_main since also needed by client.
allow_download = Cvar_Get ("allow_download", "1", CVAR_ARCHIVE);
allow_download_players = Cvar_Get ("allow_download_players", "0", CVAR_ARCHIVE);
allow_download_models = Cvar_Get ("allow_download_models", "1", CVAR_ARCHIVE);
allow_download_sounds = Cvar_Get ("allow_download_sounds", "1", CVAR_ARCHIVE);
allow_download_maps = Cvar_Get ("allow_download_maps", "1", CVAR_ARCHIVE);
s = va("%4.2f %s %s %s", VERSION, CPUSTRING, __DATE__, BUILDSTRING);
Cvar_Get ("version", s, CVAR_SERVERINFO|CVAR_NOSET);

23
server/sv_main.c
View File

@ -34,11 +34,12 @@ cvar_t *zombietime; // seconds to sink messages after disconnect
cvar_t *rcon_password; // password for remote server commands
cvar_t *allow_download;
cvar_t *allow_download_players;
cvar_t *allow_download_models;
cvar_t *allow_download_sounds;
cvar_t *allow_download_maps;
//NEPHATRINE: Moved these to common since also needed by client.
//cvar_t *allow_download;
//cvar_t *allow_download_players;
//cvar_t *allow_download_models;
//cvar_t *allow_download_sounds;
//cvar_t *allow_download_maps;
cvar_t *sv_airaccelerate;
@ -966,11 +967,13 @@ void SV_Init (void)
sv_paused = Cvar_Get ("paused", "0", 0);
sv_timedemo = Cvar_Get ("timedemo", "0", 0);
sv_enforcetime = Cvar_Get ("sv_enforcetime", "0", 0);
allow_download = Cvar_Get ("allow_download", "1", CVAR_ARCHIVE);
allow_download_players = Cvar_Get ("allow_download_players", "0", CVAR_ARCHIVE);
allow_download_models = Cvar_Get ("allow_download_models", "1", CVAR_ARCHIVE);
allow_download_sounds = Cvar_Get ("allow_download_sounds", "1", CVAR_ARCHIVE);
allow_download_maps = Cvar_Get ("allow_download_maps", "1", CVAR_ARCHIVE);
//NEPHATRINE: Moved these to common since also needed by client.
//allow_download = Cvar_Get ("allow_download", "1", CVAR_ARCHIVE);
//allow_download_players = Cvar_Get ("allow_download_players", "0", CVAR_ARCHIVE);
//allow_download_models = Cvar_Get ("allow_download_models", "1", CVAR_ARCHIVE);
//allow_download_sounds = Cvar_Get ("allow_download_sounds", "1", CVAR_ARCHIVE);
//allow_download_maps = Cvar_Get ("allow_download_maps", "1", CVAR_ARCHIVE);
sv_noreload = Cvar_Get ("sv_noreload", "0", 0);