qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-31 08:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed stalls and mis-placed rocket which was seen only in the cygwin->mingw32 builds, also removed redundant stdin_ready code and forcing of timeout setting for win32 build

Browse source
This commit is contained in:
Chris Ison 2004-03-26 02:52:47 +00:00
parent 1d40013e5e
commit 5dcdd2c194
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/util/sys.c
View file

@ -93,8 +93,10 @@ typedef struct shutdown_list_s {
static shutdown_list_t *shutdown_list; static shutdown_list_t *shutdown_list;
#ifndef _WIN32
static int do_stdin = 1; static int do_stdin = 1;
qboolean stdin_ready; qboolean stdin_ready;
#endif
/* The translation table between the graphical font and plain ASCII --KB */ /* The translation table between the graphical font and plain ASCII --KB */
const char sys_char_map[256] = { const char sys_char_map[256] = {
@ -522,11 +524,6 @@ Sys_CheckInput (int idle, int net_socket)
_timeout.tv_sec = 0; _timeout.tv_sec = 0;
_timeout.tv_usec = net_socket < 0 ? 0 : 100; _timeout.tv_usec = net_socket < 0 ? 0 : 100;
timeout = &_timeout;
if (_kbhit ()) {
stdin_ready = 1;
return 1;
}
#else #else
_timeout.tv_sec = 0; _timeout.tv_sec = 0;
_timeout.tv_usec = net_socket < 0 ? 0 : 10000; _timeout.tv_usec = net_socket < 0 ? 0 : 10000;
@ -536,8 +533,10 @@ Sys_CheckInput (int idle, int net_socket)
// connected client times out, the message would not otherwise // connected client times out, the message would not otherwise
// be printed until the next event. // be printed until the next event.
FD_ZERO (&fdset); FD_ZERO (&fdset);
#ifndef _WIN32
if (do_stdin) if (do_stdin)
FD_SET (0, &fdset); FD_SET (0, &fdset);
#endif
if (net_socket >= 0) if (net_socket >= 0)
FD_SET (net_socket, &fdset); FD_SET (net_socket, &fdset);
@ -547,7 +546,9 @@ Sys_CheckInput (int idle, int net_socket)
res = select (max (net_socket, 0) + 1, &fdset, NULL, NULL, timeout); res = select (max (net_socket, 0) + 1, &fdset, NULL, NULL, timeout);
if (res == 0 || res == -1) if (res == 0 || res == -1)
return 0; return 0;
#ifndef _WIN32
stdin_ready = FD_ISSET (0, &fdset); stdin_ready = FD_ISSET (0, &fdset);
#endif
return 1; return 1;
} }