qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-13 00:24:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

compile fixes for win32 and take the pruning shears to *sys*.c in qw and nq

Browse source 
(they're not done yet, though)
This commit is contained in:
Bill Currie 2001-08-29 17:45:53 +00:00
parent 5aceb0435e
commit 3656d6fd59
17 changed files with 53 additions and 293 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/QF/sys.h
View file

@ -34,6 +34,9 @@
#include "QF/gcc_attr.h" #include "QF/gcc_attr.h"
extern struct cvar_s *sys_nostdout; extern struct cvar_s *sys_nostdout;
extern struct cvar_s *sys_extrasleep;
extern struct cvar_s *sys_dead_sleep;
extern struct cvar_s *sys_sleep;
extern const char sys_char_map[256]; extern const char sys_char_map[256];

2
libs/gamecode/builtins/pr_cmds.c
View file

@ -51,6 +51,8 @@
#include "QF/va.h" #include "QF/va.h"
#include "QF/zone.h" #include "QF/zone.h"
#include "compat.h"
#define RETURN_EDICT(p, e) ((p)->pr_globals[OFS_RETURN].integer_var = EDICT_TO_PROG(p, e)) #define RETURN_EDICT(p, e) ((p)->pr_globals[OFS_RETURN].integer_var = EDICT_TO_PROG(p, e))
#define RETURN_STRING(p, s) ((p)->pr_globals[OFS_RETURN].integer_var = PR_SetString((p), s)) #define RETURN_STRING(p, s) ((p)->pr_globals[OFS_RETURN].integer_var = PR_SetString((p), s))

24
libs/util/sys.c
View file

@ -65,6 +65,10 @@
static void Sys_StdPrintf (const char *fmt, va_list args); static void Sys_StdPrintf (const char *fmt, va_list args);
cvar_t *sys_nostdout; cvar_t *sys_nostdout;
cvar_t *sys_extrasleep;
cvar_t *sys_dead_sleep;
cvar_t *sys_sleep;
static sys_printf_t sys_printf_function = Sys_StdPrintf; static sys_printf_t sys_printf_function = Sys_StdPrintf;
/* The translation table between the graphical font and plain ASCII --KB */ /* The translation table between the graphical font and plain ASCII --KB */
@ -255,3 +259,23 @@ Sys_MakeCodeWriteable (unsigned long startaddr, unsigned long length)
# endif # endif
#endif #endif
} }
void
Sys_Init_Cvars (void)
{
sys_nostdout = Cvar_Get ("sys_nostdout", "0", CVAR_NONE, NULL,
"Set to disable std out");
sys_extrasleep = Cvar_Get ("sys_extrasleep", "0", CVAR_NONE, NULL,
"Set to cause whatever amount delay in "
"microseconds you want. Mostly "
"useful to generate simulated bad "
"connections.");
sys_dead_sleep = Cvar_Get ("sys_dead_sleep", "1", CVAR_NONE, NULL,
"When set, the server gets NO cpu if no "
"clients are connected and there's no other "
"activity. *MIGHT* cause problems with some "
"mods.");
sys_sleep = Cvar_Get ("sys_sleep", "8", CVAR_NONE, NULL, "Sleep how long "
"in seconds between checking for connections. "
"Minimum is 0, maximum is 13");
}

2
libs/video/targets/in_win.c
View file

@ -32,6 +32,7 @@
# include "config.h" # include "config.h"
#endif #endif
#include "winquake.h" // must come first due to nasties in windows headers
#include <dinput.h> #include <dinput.h>
#include "QF/cmd.h" #include "QF/cmd.h"
@ -42,7 +43,6 @@
#include "QF/sys.h" #include "QF/sys.h"
#include "compat.h" #include "compat.h"
#include "winquake.h"
#define DINPUT_BUFFERSIZE 16 #define DINPUT_BUFFERSIZE 16
#define iDirectInputCreate(a,b,c,d) pDirectInputCreate(a,b,c,d) #define iDirectInputCreate(a,b,c,d) pDirectInputCreate(a,b,c,d)

2
libs/video/targets/joy_win.c
View file

@ -213,7 +213,7 @@ JOY_Open (void)
{ {
return JOY_StartupJoystick(); return JOY_StartupJoystick();
// Cmd_AddCommand ("joyadvancedupdate", JOY_AdvancedUpdate_f, "FIXME: This " // Cmd_AddCommand ("joyadvancedupdate", JOY_AdvancedUpdate_f, "FIXME: This "
"appears to update the joystick poll? No Description"); // "appears to update the joystick poll? No Description");
} }
void void

5
nq/source/sys_null.c
View file

@ -191,11 +191,6 @@ Sys_ConsoleInput (void)
return NULL; return NULL;
} }
void
Sys_Sleep (void)
{
}
void void
IN_SendKeyEvents (void) IN_SendKeyEvents (void)
{ {

27
nq/source/sys_sdl.c
View file

@ -62,7 +62,6 @@
#include <SDL.h> #include <SDL.h>
#include <SDL_main.h> #include <SDL_main.h>
#include "QF/cvar.h"
#include "QF/qargs.h" #include "QF/qargs.h"
#include "QF/qargs.h" #include "QF/qargs.h"
#include "QF/sys.h" #include "QF/sys.h"
@ -72,9 +71,7 @@
#include "host.h" #include "host.h"
qboolean isDedicated = false; qboolean isDedicated = false;
char *svs_info;
int starttime;
int noconinput; int noconinput;
#ifdef _WIN32 #ifdef _WIN32
@ -84,22 +81,6 @@ qboolean Minimized = false;
void MaskExceptions (void); void MaskExceptions (void);
#endif #endif
/*
Sys_Init_Cvars
Quake calls this so the system can register variables before host_hunklevel
is marked
*/
void
Sys_Init_Cvars (void)
{
sys_nostdout = Cvar_Get ("sys_nostdout", "0", CVAR_NONE, NULL,
"Set to disable std out");
if (COM_CheckParm ("-nostdout"))
Cvar_Set (sys_nostdout, "1");
}
void void
Sys_Init (void) Sys_Init (void)
{ {
@ -198,11 +179,6 @@ Sys_LowFPPrecision (void)
} }
#endif #endif
void
Sys_Sleep (void)
{
}
#ifndef SDL_main #ifndef SDL_main
# define SDL_main main # define SDL_main main
#endif #endif
@ -242,6 +218,9 @@ SDL_main (int c, char **v)
Host_Init (&host_parms); Host_Init (&host_parms);
Sys_Init_Cvars ();
Sys_Init ();
oldtime = Sys_DoubleTime (); oldtime = Sys_DoubleTime ();
while (1) { while (1) {
// find time spent rendering last frame // find time spent rendering last frame

18
nq/source/sys_unix.c
View file

@ -50,19 +50,14 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h> #include <sys/time.h>
#include "QF/sys.h"
#include "QF/qargs.h"
#include "QF/cvar.h" #include "QF/cvar.h"
#include "QF/qargs.h"
#include "QF/sys.h"
#include "host.h" #include "host.h"
#include "server.h" #include "server.h"
qboolean isDedicated; qboolean isDedicated = false;
cvar_t *sys_linerefresh;
cvar_t *timestamps;
cvar_t *timeformat;
void void
Sys_Init (void) Sys_Init (void)
@ -196,13 +191,10 @@ main (int c, const char *v[])
Host_Init (&parms); Host_Init (&parms);
Sys_Init_Cvars ();
Sys_Init (); Sys_Init ();
sys_nostdout = Cvar_Get ("sys_nostdout", "0", CVAR_NONE, NULL, if (!sys_nostdout->int_val) {
"set to disable std out");
if (COM_CheckParm ("-nostdout"))
Cvar_Set (sys_nostdout, "1");
else {
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY); fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
printf ("Quake -- Version %s\n", NQ_VERSION); printf ("Quake -- Version %s\n", NQ_VERSION);
} }

63
nq/source/sys_unixd.c
View file

@ -67,11 +67,6 @@ qboolean isDedicated;
int nostdout = 0; int nostdout = 0;
cvar_t *sys_linerefresh;
cvar_t *timestamps;
cvar_t *timeformat;
int int
Sys_FileOpenRead (char *path, int *handle) Sys_FileOpenRead (char *path, int *handle)
{ {
@ -144,44 +139,6 @@ Sys_DebugLog (char *file, char *fmt, ...)
close (fd); close (fd);
} }
#define MAX_PRINT_MSG 4096
void
Sys_Printf (char *fmt, ...)
{
va_list argptr;
char start[MAX_PRINT_MSG]; // String we started with
char stamp[MAX_PRINT_MSG]; // Time stamp
char final[MAX_PRINT_MSG]; // String we print
time_t mytime = 0;
struct tm *local = NULL;
unsigned char *p;
va_start (argptr, fmt);
vsnprintf (start, sizeof (start), fmt, argptr);
va_end (argptr);
if (nostdout)
return;
if (timestamps && timeformat && timestamps && timeformat
&& timeformat->string && timestamps->int_val) {
mytime = time (NULL);
local = localtime (&mytime);
strftime (stamp, sizeof (stamp), timeformat->string, local);
snprintf (final, sizeof (final), "%s%s", stamp, start);
} else {
snprintf (final, sizeof (final), "%s", start);
}
for (p = (unsigned char *) final; *p; p++) {
putc (qfont_table[*p], stdout);
}
fflush (stdout);
}
void void
Sys_Error (char *error, ...) Sys_Error (char *error, ...)
{ {
@ -218,23 +175,6 @@ Sys_Init (void)
#endif #endif
} }
double
Sys_DoubleTime (void)
{
struct timeval tp;
struct timezone tzp;
static int secbase;
gettimeofday (&tp, &tzp);
if (!secbase) {
secbase = tp.tv_sec;
return tp.tv_usec / 1000000.0;
}
return (tp.tv_sec - secbase) + tp.tv_usec / 1000000.0;
}
char * char *
Sys_ConsoleInput (void) Sys_ConsoleInput (void)
{ {
@ -314,6 +254,9 @@ main (int argc, char *argv[])
printf ("Host_Init\n"); printf ("Host_Init\n");
Host_Init (&parms); Host_Init (&parms);
Sys_Init_Cvars ();
Sys_Init ();
oldtime = Sys_DoubleTime () - 0.1; oldtime = Sys_DoubleTime () - 0.1;
while (1) { // Main message loop while (1) { // Main message loop

35
nq/source/sys_win.c
View file

@ -55,13 +55,10 @@
// minimization // minimization
#define NOT_FOCUS_SLEEP 20 // sleep time when not focus #define NOT_FOCUS_SLEEP 20 // sleep time when not focus
int starttime;
qboolean ActiveApp, Minimized; qboolean ActiveApp, Minimized;
qboolean WinNT; qboolean WinNT;
static double pfreq; static double pfreq;
static double curtime = 0.0;
static double lastcurtime = 0.0;
static int lowshift; static int lowshift;
qboolean isDedicated; qboolean isDedicated;
static qboolean sc_return_on_enter = false; static qboolean sc_return_on_enter = false;
@ -75,7 +72,6 @@ static HANDLE heventParent;
static HANDLE heventChild; static HANDLE heventChild;
void MaskExceptions (void); void MaskExceptions (void);
void Sys_InitFloatTime (void);
void Sys_PushFPCW_SetHigh (void); void Sys_PushFPCW_SetHigh (void);
void Sys_PopFPCW (void); void Sys_PopFPCW (void);
@ -172,8 +168,6 @@ Sys_Init (void)
pfreq = 1.0 / (double) lowpart; pfreq = 1.0 / (double) lowpart;
Sys_InitFloatTime ();
vinfo.dwOSVersionInfoSize = sizeof (vinfo); vinfo.dwOSVersionInfoSize = sizeof (vinfo);
if (!GetVersionEx (&vinfo)) if (!GetVersionEx (&vinfo))
@ -279,24 +273,6 @@ Sys_Quit (void)
exit (0); exit (0);
} }
void
Sys_InitFloatTime (void)
{
int j;
Sys_DoubleTime ();
j = COM_CheckParm ("-starttime");
if (j) {
curtime = (double) (atof (com_argv[j + 1]));
} else {
curtime = 0.0;
}
lastcurtime = curtime;
}
const char * const char *
Sys_ConsoleInput (void) Sys_ConsoleInput (void)
{ {
@ -370,12 +346,6 @@ Sys_ConsoleInput (void)
return NULL; return NULL;
} }
void
Sys_Sleep (void)
{
Sleep (1);
}
// WINDOWS CRAP =============================================================== // WINDOWS CRAP ===============================================================
void void
@ -534,6 +504,9 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
Sys_Printf ("Host_Init\n"); Sys_Printf ("Host_Init\n");
Host_Init (&parms); Host_Init (&parms);
Sys_Init_Cvars ();
Sys_Init ();
oldtime = Sys_DoubleTime (); oldtime = Sys_DoubleTime ();
/* main window message loop */ /* main window message loop */
@ -543,7 +516,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
time = newtime - oldtime; time = newtime - oldtime;
while (time < sys_ticrate->value) { while (time < sys_ticrate->value) {
Sys_Sleep (); Sleep (1);
newtime = Sys_DoubleTime (); newtime = Sys_DoubleTime ();
time = newtime - oldtime; time = newtime - oldtime;
} }

24
nq/source/sys_wind.c
View file

@ -186,27 +186,6 @@ Sys_Quit (void)
exit (0); exit (0);
} }
double
Sys_DoubleTime (void)
{
double t;
struct _timeb tstruct;
static int starttime;
_ftime (&tstruct);
if (!starttime)
starttime = tstruct.time;
t = (tstruct.time - starttime) + tstruct.millitm * 0.001;
return t;
}
void
Sys_Sleep (void)
{
}
void void
IN_SendKeyEvents (void) IN_SendKeyEvents (void)
{ {
@ -295,6 +274,9 @@ main (int argc, char **argv)
printf ("Host_Init\n"); printf ("Host_Init\n");
Host_Init (&parms); Host_Init (&parms);
Sys_Init_Cvars ();
Sys_Init ();
oldtime = Sys_DoubleTime (); oldtime = Sys_DoubleTime ();
/* main window message loop */ /* main window message loop */

19
qw/source/cl_demo.c
View file

@ -58,7 +58,7 @@
int cl_timeframes_isactive; int cl_timeframes_isactive;
int cl_timeframes_index; int cl_timeframes_index;
int demotime_cached; int demotime_cached;
struct timeval *cl_timeframes_array; double *cl_timeframes_array;
#define CL_TIMEFRAMES_ARRAYBLOCK 4096 #define CL_TIMEFRAMES_ARRAYBLOCK 4096
extern cvar_t *cl_timeframes; extern cvar_t *cl_timeframes;
@ -825,18 +825,15 @@ CL_TimeFrames_Reset (void)
void void
CL_TimeFrames_AddTimestamp (void) CL_TimeFrames_AddTimestamp (void)
{ {
int retval;
if (cl_timeframes_isactive) { if (cl_timeframes_isactive) {
if (!(cl_timeframes_index % CL_TIMEFRAMES_ARRAYBLOCK)) if (!(cl_timeframes_index % CL_TIMEFRAMES_ARRAYBLOCK))
cl_timeframes_array = realloc cl_timeframes_array = realloc
(cl_timeframes_array, sizeof(struct timeval) * (cl_timeframes_array, sizeof(cl_timeframes_array[0]) *
((cl_timeframes_index / CL_TIMEFRAMES_ARRAYBLOCK) + 1) * ((cl_timeframes_index / CL_TIMEFRAMES_ARRAYBLOCK) + 1) *
CL_TIMEFRAMES_ARRAYBLOCK); CL_TIMEFRAMES_ARRAYBLOCK);
if (cl_timeframes_array == NULL) if (cl_timeframes_array == NULL)
Sys_Error ("Unable to allocate timeframes buffer\n"); Sys_Error ("Unable to allocate timeframes buffer\n");
retval = gettimeofday(cl_timeframes_array + cl_timeframes_index, NULL); cl_timeframes_array[cl_timeframes_index] = Sys_DoubleTime ();
if (retval)
Sys_Error ("CL_TimeFrames_Addtimestamp: gettimeofday() failed.\n");
cl_timeframes_index++; cl_timeframes_index++;
} }
return; return;
@ -861,15 +858,7 @@ void CL_TimeFrames_DumpLog (void)
return; return;
} }
for (i = 1; i < cl_timeframes_index; i++) { for (i = 1; i < cl_timeframes_index; i++) {
frame = (cl_timeframes_array[i].tv_sec - frame = (cl_timeframes_array[i] - cl_timeframes_array[i - 1]) * 1e6;
cl_timeframes_array[i - 1].tv_sec);
if (frame < 999) {
frame *= 1000000;
frame += cl_timeframes_array[i].tv_usec -
cl_timeframes_array[i - 1].tv_usec;
} else
frame = 999999999;
Qprintf (outputfile, "%09ld\n", frame); Qprintf (outputfile, "%09ld\n", frame);
} }
Qclose (outputfile); Qclose (outputfile);

22
qw/source/cl_sys_sdl.c
View file

@ -61,7 +61,6 @@
#include <SDL.h> #include <SDL.h>
#include <SDL_main.h> #include <SDL_main.h>
#include "QF/cvar.h"
#include "QF/sys.h" #include "QF/sys.h"
#include "QF/qargs.h" #include "QF/qargs.h"
@ -72,7 +71,6 @@
qboolean is_server = false; qboolean is_server = false;
char *svs_info; char *svs_info;
int starttime;
int noconinput; int noconinput;
#ifdef _WIN32 #ifdef _WIN32
@ -83,21 +81,6 @@ void MaskExceptions (void);
#endif #endif
/*
Sys_Init_Cvars
Quake calls this so the system can register variables before host_hunklevel
is marked
*/
void
Sys_Init_Cvars (void)
{
sys_nostdout = Cvar_Get ("sys_nostdout", "0", CVAR_NONE, NULL,
"set to disable std out");
if (COM_CheckParm ("-nostdout"))
Cvar_Set (sys_nostdout, "1");
}
void void
Sys_Init (void) Sys_Init (void)
{ {
@ -198,11 +181,6 @@ Sys_LowFPPrecision (void)
} }
#endif #endif
void
Sys_Sleep (void)
{
}
#ifndef SDL_main #ifndef SDL_main
# define SDL_main main # define SDL_main main
#endif #endif

17
qw/source/cl_sys_unix.c
View file

@ -51,7 +51,6 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/types.h> #include <sys/types.h>
#include "QF/cvar.h"
#include "QF/qargs.h" #include "QF/qargs.h"
#include "QF/sys.h" #include "QF/sys.h"
@ -62,22 +61,6 @@ int noconinput = 0;
qboolean is_server = false; qboolean is_server = false;
char *svs_info; char *svs_info;
/*
Sys_Init_Cvars
Quake calls this so the system can register variables before host_hunklevel
is marked
*/
void
Sys_Init_Cvars (void)
{
sys_nostdout = Cvar_Get ("sys_nostdout", "0", CVAR_NONE, NULL,
"set to disable std out");
if (COM_CheckParm ("-nostdout"))
Cvar_Set (sys_nostdout, "1");
}
void void
Sys_Init (void) Sys_Init (void)
{ {

37
qw/source/cl_sys_win.c
View file

@ -43,7 +43,6 @@
#include <windows.h> #include <windows.h>
#include "QF/console.h" #include "QF/console.h"
#include "QF/cvar.h"
#include "QF/qargs.h" #include "QF/qargs.h"
#include "QF/screen.h" #include "QF/screen.h"
#include "QF/sound.h" #include "QF/sound.h"
@ -65,8 +64,6 @@
char *svs_info; char *svs_info;
int starttime;
qboolean ActiveApp, Minimized, WinNT; qboolean ActiveApp, Minimized, WinNT;
qboolean is_server = false; qboolean is_server = false;
@ -81,21 +78,6 @@ void Sys_PopFPCW (void);
void Sys_PushFPCW_SetHigh (void); void Sys_PushFPCW_SetHigh (void);
void Sys_InitFloatTime (void); void Sys_InitFloatTime (void);
extern cvar_t *sys_nostdout;
/*
Sys_Init_Cvars
Quake calls this so the system can register variables before host_hunklevel
is marked
*/
void
Sys_Init_Cvars (void)
{
sys_nostdout = Cvar_Get ("sys_nostdout", "1", CVAR_NONE, NULL, "unset to "
"enable std out - windows does NOT support this");
}
void void
Sys_Init (void) Sys_Init (void)
@ -195,19 +177,6 @@ Sys_DebugLog (const char *file, const char *fmt, ...)
close (fd); close (fd);
}; };
int
wfilelength (VFile *f)
{
int end, pos;
pos = Qtell (f);
Qseek (f, 0, SEEK_END);
end = Qtell (f);
Qseek (f, pos, SEEK_SET);
return end;
}
/* /*
Sys_ConsoleInput Sys_ConsoleInput
@ -319,15 +288,9 @@ Sys_ConsoleInput (void)
return NULL; return NULL;
} }
void
Sys_Sleep (void)
{
}
void void
SleepUntilInput (int time) SleepUntilInput (int time)
{ {
MsgWaitForMultipleObjects (1, &tevent, FALSE, time, QS_ALLINPUT); MsgWaitForMultipleObjects (1, &tevent, FALSE, time, QS_ALLINPUT);
} }

27
qw/source/sv_sys_unix.c
View file

@ -57,37 +57,11 @@
# include <libc.h> # include <libc.h>
#endif #endif
cvar_t *sys_extrasleep;
cvar_t *sys_dead_sleep;
qboolean is_server = true; qboolean is_server = true;
qboolean stdin_ready; qboolean stdin_ready;
server_static_t svs; server_static_t svs;
char *svs_info = svs.info; char *svs_info = svs.info;
/*
Sys_Init_Cvars
Quake calls this so the system can register variables before host_hunklevel
is marked
*/
void
Sys_Init_Cvars (void)
{
sys_nostdout = Cvar_Get ("sys_nostdout", "0", CVAR_NONE, NULL,
"Toggles console screen output");
sys_extrasleep = Cvar_Get ("sys_extrasleep", "0", CVAR_NONE, NULL,
"Set to cause whatever amount delay in microseconds you want. Mostly "
"useful to generate simulated bad "
"connections.");
sys_dead_sleep = Cvar_Get ("sys_dead_sleep", "1", CVAR_NONE, NULL,
"When set, the server gets NO cpu if no "
"clients are connected and there's no other "
"activity. *MIGHT* cause problems with some "
"mods.");
}
void void
Sys_Init (void) Sys_Init (void)
{ {
@ -99,7 +73,6 @@ Sys_Init (void)
void void
Sys_Quit (void) Sys_Quit (void)
{ {
Net_LogStop(); Net_LogStop();
exit (0); exit (0);

19
qw/source/sv_sys_win.c
View file

@ -47,25 +47,6 @@ qboolean WinNT;
server_static_t svs; server_static_t svs;
char *svs_info = svs.info; char *svs_info = svs.info;
extern cvar_t *sys_nostdout;
cvar_t *sys_sleep;
/*
Sys_Init_Cvars
Quake calls this so the system can register variables before host_hunklevel
is marked
*/
void
Sys_Init_Cvars (void)
{
sys_nostdout = Cvar_Get ("sys_nostdout", "0", CVAR_NONE, NULL,
"Toggle console output");
sys_sleep = Cvar_Get ("sys_sleep", "8", CVAR_NONE, NULL, "Sleep how long "
"in seconds between checking for connections. "
"Minimum is 0, maximum is 13");
}
void void
Sys_Init (void) Sys_Init (void)