Browse Source

Moved some global variables around for portability

console
Nico de Poel 5 years ago
parent
commit
99b09dc854
  1. 2
      engine/Quake/gl_vidsdl.c
  2. 1
      engine/Quake/sys_sdl_win.c
  3. 3
      engine/UniQuake/gl_uniquake.c
  4. 2
      engine/UniQuake/sys_uniquake.c
  5. 3
      engine/UniQuake/uniquake.c

2
engine/Quake/gl_vidsdl.c

@ -94,8 +94,6 @@ static void ClearAllStates (void);
static void GL_Init (void); static void GL_Init (void);
static void GL_SetupState (void); //johnfitz static void GL_SetupState (void); //johnfitz
viddef_t vid; // global video state
modestate_t modestate = MS_UNINIT;
qboolean scr_skipupdate; qboolean scr_skipupdate;
qboolean gl_mtexable = false; qboolean gl_mtexable = false;

1
engine/Quake/sys_sdl_win.c

@ -47,7 +47,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#endif #endif
qboolean isDedicated;
qboolean Win95, Win95old, WinNT, WinVista; qboolean Win95, Win95old, WinNT, WinVista;
cvar_t sys_throttle = {"sys_throttle", "0.02", CVAR_ARCHIVE}; cvar_t sys_throttle = {"sys_throttle", "0.02", CVAR_ARCHIVE};

3
engine/UniQuake/gl_uniquake.c

@ -3,6 +3,9 @@
#include "../Quake/quakedef.h" #include "../Quake/quakedef.h"
#include "../Quake/gl_model.h" #include "../Quake/gl_model.h"
viddef_t vid; // global video state
modestate_t modestate = MS_UNINIT;
typedef struct unity_glcalls_s typedef struct unity_glcalls_s
{ {
void *target; void *target;

2
engine/UniQuake/sys_uniquake.c

@ -2,6 +2,8 @@
#include "../Quake/quakedef.h" #include "../Quake/quakedef.h"
qboolean isDedicated;
typedef struct unity_syscalls_s typedef struct unity_syscalls_s
{ {
void *target; void *target;

3
engine/UniQuake/uniquake.c

@ -25,6 +25,9 @@ UNIQUAKE_API void UniQuake_Init(quakeparms_t *parms, const unity_syscalls_t *sys
parms->argc = com_argc; parms->argc = com_argc;
parms->argv = com_argv; parms->argv = com_argv;
// UniQuake won't support dedicated servers at all
isDedicated = false;
#ifdef USE_LIBSDL #ifdef USE_LIBSDL
Sys_InitSDL(); Sys_InitSDL();
#endif #endif

Loading…
Cancel
Save