eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Cleanup, removal of dead code, cosmetics, etc.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1185 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Mark Olsen 2005-08-01 15:08:05 +00:00
parent 625f6b8527
commit 7bdacbbaa3
1 changed files with 60 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

207
engine/client/sys_linux.c
View file

@ -52,9 +52,6 @@ int nostdout = 0;
char *basedir = "."; char *basedir = ".";
char *cachedir = "/tmp"; char *cachedir = "/tmp";
cvar_t sys_linerefresh = {"sys_linerefresh","0"};// set for entity display
qboolean Sys_InitTerminal (void) //we either have one or we don't. qboolean Sys_InitTerminal (void) //we either have one or we don't.
{ {
return true; return true;
@ -74,53 +71,6 @@ void Sys_DebugNumber(int y, int val)
{ {
} }
/*
void Sys_Printf (char *fmt, ...)
{
va_list argptr;
char text[1024];
va_start (argptr,fmt);
_vsnprintf (text,sizeof(text)-1, fmt,argptr);
va_end (argptr);
fprintf(stderr, "%s", text);
Con_Print (text);
}
void Sys_Printf (char *fmt, ...)
{
va_list argptr;
char text[1024], *t_p;
int l, r;
if (nostdout)
return;
va_start (argptr,fmt);
_vsnprintf (text,sizeof(text)-1, fmt,argptr);
va_end (argptr);
l = strlen(text);
t_p = text;
// make sure everything goes through, even though we are non-blocking
while (l)
{
r = write (1, text, l);
if (r != l)
sleep (0);
if (r > 0)
{
t_p += r;
l -= r;
}
}
}
*/
void Sys_Printf (char *fmt, ...) void Sys_Printf (char *fmt, ...)
{ {
va_list argptr; va_list argptr;
@ -134,8 +84,8 @@ void Sys_Printf (char *fmt, ...)
if (strlen(text) > sizeof(text)) if (strlen(text) > sizeof(text))
Sys_Error("memory overwrite in Sys_Printf"); Sys_Error("memory overwrite in Sys_Printf");
if (nostdout) if (nostdout)
return; return;
for (p = (unsigned char *)text; *p; p++) for (p = (unsigned char *)text; *p; p++)
if ((*p > 128 || *p < 32) && *p != 10 && *p != 13 && *p != 9) if ((*p > 128 || *p < 32) && *p != 10 && *p != 13 && *p != 9)
@ -147,7 +97,7 @@ void Sys_Printf (char *fmt, ...)
void Sys_Quit (void) void Sys_Quit (void)
{ {
Host_Shutdown(); Host_Shutdown();
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
exit(0); exit(0);
} }
@ -160,32 +110,30 @@ void Sys_Init(void)
void Sys_Error (const char *error, ...) void Sys_Error (const char *error, ...)
{ {
va_list argptr; va_list argptr;
char string[1024]; char string[1024];
// change stdin to non blocking // change stdin to non blocking
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
va_start (argptr,error); va_start (argptr,error);
_vsnprintf (string,sizeof(string)-1, error,argptr); _vsnprintf (string,sizeof(string)-1, error,argptr);
va_end (argptr); va_end (argptr);
fprintf(stderr, "Error: %s\n", string); fprintf(stderr, "Error: %s\n", string);
Host_Shutdown (); Host_Shutdown ();
exit (1); exit (1);
} }
void Sys_Warn (char *warning, ...) void Sys_Warn (char *warning, ...)
{ {
va_list argptr; va_list argptr;
char string[1024]; char string[1024];
va_start (argptr,warning); va_start (argptr,warning);
_vsnprintf (string,sizeof(string)-1, warning,argptr); _vsnprintf (string,sizeof(string)-1, warning,argptr);
va_end (argptr); va_end (argptr);
fprintf(stderr, "Warning: %s", string); fprintf(stderr, "Warning: %s", string);
} }
@ -209,8 +157,9 @@ int Sys_FileTime (char *path)
void Sys_mkdir (char *path) void Sys_mkdir (char *path)
{ {
mkdir (path, 0777); mkdir (path, 0777);
} }
qboolean Sys_remove (char *path) qboolean Sys_remove (char *path)
{ {
return system(va("rm \"%s\"", path)); return system(va("rm \"%s\"", path));
@ -218,9 +167,8 @@ qboolean Sys_remove (char *path)
int Sys_FileOpenRead (char *path, int *handle) int Sys_FileOpenRead (char *path, int *handle)
{ {
int h; int h;
struct stat fileinfo; struct stat fileinfo;
h = open (path, O_RDONLY, 0666); h = open (path, O_RDONLY, 0666);
*handle = h; *handle = h;
@ -235,12 +183,11 @@ int Sys_FileOpenRead (char *path, int *handle)
int Sys_FileOpenWrite (char *path) int Sys_FileOpenWrite (char *path)
{ {
int handle; int handle;
umask (0); umask (0);
handle = open(path,O_RDWR | O_CREAT | O_TRUNC handle = open(path,O_RDWR | O_CREAT | O_TRUNC, 0666);
, 0666);
if (handle == -1) if (handle == -1)
Sys_Error ("Error opening %s: %s", path,strerror(errno)); Sys_Error ("Error opening %s: %s", path,strerror(errno));
@ -265,48 +212,26 @@ void Sys_FileSeek (int handle, int position)
int Sys_FileRead (int handle, void *dest, int count) int Sys_FileRead (int handle, void *dest, int count)
{ {
return read (handle, dest, count); return read (handle, dest, count);
} }
void Sys_DebugLog(char *file, char *fmt, ...) void Sys_DebugLog(char *file, char *fmt, ...)
{ {
va_list argptr; va_list argptr;
static char data[1024]; static char data[1024];
int fd; int fd;
va_start(argptr, fmt); va_start(argptr, fmt);
_vsnprintf (data,sizeof(data)-1, fmt, argptr); _vsnprintf (data,sizeof(data)-1, fmt, argptr);
va_end(argptr); va_end(argptr);
if (strlen(data) > sizeof(data)) if (strlen(data) > sizeof(data))
Sys_Error("Sys_DebugLog's buffer was stomped\n"); Sys_Error("Sys_DebugLog's buffer was stomped\n");
// fd = open(file, O_WRONLY | O_BINARY | O_CREAT | O_APPEND, 0666);
fd = open(file, O_WRONLY | O_CREAT | O_APPEND, 0666);
write(fd, data, strlen(data));
close(fd);
}
void Sys_EditFile(char *filename)
{
char cmd[256];
char *term;
char *editor;
term = getenv("TERM");
if (term && !strcmp(term, "xterm"))
{
editor = getenv("VISUAL");
if (!editor)
editor = getenv("EDITOR");
if (!editor)
editor = getenv("EDIT");
if (!editor)
editor = "vi";
sprintf(cmd, "xterm -e %s %s", editor, filename);
system(cmd);
}
// fd = open(file, O_WRONLY | O_BINARY | O_CREAT | O_APPEND, 0666);
fd = open(file, O_WRONLY | O_CREAT | O_APPEND, 0666);
write(fd, data, strlen(data));
close(fd);
} }
int Sys_EnumerateFiles (char *gpath, char *match, int (*func)(char *, int, void *), void *parm) int Sys_EnumerateFiles (char *gpath, char *match, int (*func)(char *, int, void *), void *parm)
@ -389,25 +314,25 @@ int Sys_EnumerateFiles (char *gpath, char *match, int (*func)(char *, int, void
double Sys_DoubleTime (void) double Sys_DoubleTime (void)
{ {
struct timeval tp; struct timeval tp;
struct timezone tzp; struct timezone tzp;
static int secbase; static int secbase;
gettimeofday(&tp, &tzp); gettimeofday(&tp, &tzp);
if (!secbase) if (!secbase)
{ {
secbase = tp.tv_sec; secbase = tp.tv_sec;
return tp.tv_usec/1000000.0; return tp.tv_usec/1000000.0;
} }
return (tp.tv_sec - secbase) + tp.tv_usec/1000000.0; return (tp.tv_sec - secbase) + tp.tv_usec/1000000.0;
} }
void Sys_UnloadGame (void) void Sys_UnloadGame (void)
{ {
} }
void *Sys_GetGameAPI (void *parms) void *Sys_GetGameAPI (void *parms)
{ {
return NULL; return NULL;
@ -424,26 +349,18 @@ void alarm_handler(int x)
oktogo=1; oktogo=1;
} }
void Sys_LineRefresh(void)
{
}
void floating_point_exception_handler(int whatever)
{
// Sys_Warn("floating point exception\n");
signal(SIGFPE, floating_point_exception_handler);
}
char *Sys_ConsoleInput(void) char *Sys_ConsoleInput(void)
{ {
#if 0 #if 0
static char text[256]; static char text[256];
int len; int len;
if (cls.state == ca_dedicated) { if (cls.state == ca_dedicated)
{
len = read (0, text, sizeof(text)); len = read (0, text, sizeof(text));
if (len < 1) if (len < 1)
return NULL; return NULL;
text[len-1] = 0; // rip off the /n and terminate text[len-1] = 0; // rip off the /n and terminate
return text; return text;
@ -462,18 +379,14 @@ void Sys_LowFPPrecision (void)
} }
#endif #endif
int skipframes;
int main (int c, char **v) int main (int c, char **v)
{ {
double time, oldtime, newtime;
double time, oldtime, newtime;
quakeparms_t parms; quakeparms_t parms;
int j; int j;
// static char cwd[1024]; // static char cwd[1024];
// signal(SIGFPE, floating_point_exception_handler);
signal(SIGFPE, SIG_IGN); signal(SIGFPE, SIG_IGN);
memset(&parms, 0, sizeof(parms)); memset(&parms, 0, sizeof(parms));
@ -488,6 +401,7 @@ int main (int c, char **v)
j = COM_CheckParm("-mem"); j = COM_CheckParm("-mem");
if (j && j+1 < com_argc) if (j && j+1 < com_argc)
parms.memsize = (int) (Q_atof(com_argv[j+1]) * 1024 * 1024); parms.memsize = (int) (Q_atof(com_argv[j+1]) * 1024 * 1024);
parms.membase = malloc (parms.memsize); parms.membase = malloc (parms.memsize);
parms.basedir = basedir; parms.basedir = basedir;
@ -503,19 +417,18 @@ int main (int c, char **v)
Sys_Init(); Sys_Init();
Host_Init(&parms); Host_Init(&parms);
oldtime = Sys_DoubleTime (); oldtime = Sys_DoubleTime ();
while (1) while (1)
{ {
// find time spent rendering last frame // find time spent rendering last frame
newtime = Sys_DoubleTime (); newtime = Sys_DoubleTime ();
time = newtime - oldtime; time = newtime - oldtime;
Host_Frame(time); Host_Frame(time);
oldtime = newtime; oldtime = newtime;
} }
} }