yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-12-01 16:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Untangle global variables between dedicated only and normal build.

Browse source
This commit is contained in:
Yamagi Burmeister 2017-09-07 14:37:51 +02:00
parent 70f678fb80
commit 950e581103
1 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/common/frame.c
View file

@ -28,44 +28,40 @@
#include "header/zone.h" #include "header/zone.h"
#include <setjmp.h> #include <setjmp.h>
FILE *log_stats_file;
cvar_t *host_speeds;
cvar_t *log_stats;
cvar_t *developer; cvar_t *developer;
cvar_t *modder; cvar_t *modder;
cvar_t *timescale; cvar_t *timescale;
cvar_t *fixedtime; cvar_t *fixedtime;
// For timing calculations.
cvar_t *cl_maxfps; cvar_t *cl_maxfps;
cvar_t *gl_maxfps;
cvar_t *cl_async;
cvar_t *cl_timedemo;
#ifndef DEDICATED_ONLY
cvar_t *showtrace;
#endif
cvar_t *dedicated; cvar_t *dedicated;
extern cvar_t *logfile_active; extern cvar_t *logfile_active;
extern jmp_buf abortframe; /* an ERR_DROP occured, exit the entire frame */ extern jmp_buf abortframe; /* an ERR_DROP occured, exit the entire frame */
extern zhead_t z_chain; extern zhead_t z_chain;
#ifndef DEDICATED_ONLY
FILE *log_stats_file;
cvar_t *cl_async;
cvar_t *cl_timedemo;
cvar_t *gl_maxfps;
cvar_t *host_speeds;
cvar_t *log_stats;
cvar_t *showtrace;
#endif
// Forward declarations // Forward declarations
#ifndef DEDICATED_ONLY #ifndef DEDICATED_ONLY
int GLimp_GetRefreshRate(void); int GLimp_GetRefreshRate(void);
qboolean R_IsVSyncActive(void); qboolean R_IsVSyncActive(void);
#endif #endif
/* host_speeds times */ /* host_speeds times */
int time_before_game; int time_before_game;
int time_after_game; int time_after_game;
int time_before_ref; int time_before_ref;
int time_after_ref; int time_after_ref;
#ifndef DEDICATED_ONLY #ifndef DEDICATED_ONLY
void Key_Init(void); void Key_Init(void);
void SCR_EndLoadingPlaque(void); void SCR_EndLoadingPlaque(void);
@ -118,14 +114,14 @@ Qcommon_Init(int argc, char **argv)
Cmd_AddCommand("z_stats", Z_Stats_f); Cmd_AddCommand("z_stats", Z_Stats_f);
// cvars // cvars
cl_async = Cvar_Get("cl_async", "1", CVAR_ARCHIVE);
cl_maxfps = Cvar_Get("cl_maxfps", "60", CVAR_ARCHIVE); cl_maxfps = Cvar_Get("cl_maxfps", "60", CVAR_ARCHIVE);
cl_timedemo = Cvar_Get("timedemo", "0", 0);
developer = Cvar_Get("developer", "0", 0); developer = Cvar_Get("developer", "0", 0);
fixedtime = Cvar_Get("fixedtime", "0", 0); fixedtime = Cvar_Get("fixedtime", "0", 0);
gl_maxfps = Cvar_Get("gl_maxfps", "95", CVAR_ARCHIVE);
host_speeds = Cvar_Get("host_speeds", "0", 0);
log_stats = Cvar_Get("log_stats", "0", 0);
logfile_active = Cvar_Get("logfile", "1", CVAR_ARCHIVE); logfile_active = Cvar_Get("logfile", "1", CVAR_ARCHIVE);
modder = Cvar_Get("modder", "0", 0); modder = Cvar_Get("modder", "0", 0);
timescale = Cvar_Get("timescale", "1", 0); timescale = Cvar_Get("timescale", "1", 0);
@ -135,8 +131,13 @@ Qcommon_Init(int argc, char **argv)
Cvar_Get("version", s, CVAR_SERVERINFO | CVAR_NOSET); Cvar_Get("version", s, CVAR_SERVERINFO | CVAR_NOSET);
#ifndef DEDICATED_ONLY #ifndef DEDICATED_ONLY
showtrace = Cvar_Get("showtrace", "0", 0); cl_async = Cvar_Get("cl_async", "1", CVAR_ARCHIVE);
cl_timedemo = Cvar_Get("timedemo", "0", 0);
dedicated = Cvar_Get("dedicated", "0", CVAR_NOSET); dedicated = Cvar_Get("dedicated", "0", CVAR_NOSET);
gl_maxfps = Cvar_Get("gl_maxfps", "95", CVAR_ARCHIVE);
host_speeds = Cvar_Get("host_speeds", "0", 0);
log_stats = Cvar_Get("log_stats", "0", 0);
showtrace = Cvar_Get("showtrace", "0", 0);
#else #else
dedicated = Cvar_Get("dedicated", "1", CVAR_NOSET); dedicated = Cvar_Get("dedicated", "1", CVAR_NOSET);
#endif #endif