From 01ab5f4fbec43e851254cefe8be66f3ab63a0499 Mon Sep 17 00:00:00 2001 From: Danne Date: Tue, 16 May 2000 13:57:54 +0000 Subject: [PATCH] Borland fixes --- include/qwsvdef.h | 1 + source/sv_sys_win.c | 2 +- source/world.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/qwsvdef.h b/include/qwsvdef.h index d9637cd..7e2111a 100644 --- a/include/qwsvdef.h +++ b/include/qwsvdef.h @@ -66,6 +66,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef __BORLANDC__ #define snprintf _snprintf #define vsnprintf _vsnprintf +#define kbhit _kbhit #endif #endif diff --git a/source/sv_sys_win.c b/source/sv_sys_win.c index ff7ceb7..fb0f1bf 100644 --- a/source/sv_sys_win.c +++ b/source/sv_sys_win.c @@ -94,7 +94,7 @@ char *Sys_ConsoleInput (void) int c; // read a line out - while (_kbhit()) + while (kbhit()) { c = _getch(); putch (c); diff --git a/source/world.c b/source/world.c index 9e8e296..07afc94 100644 --- a/source/world.c +++ b/source/world.c @@ -750,7 +750,7 @@ void SV_ClipToLinks ( areanode_t *node, moveclip_t *clip ) || clip->boxmaxs[2] < touch->v.absmin[2] ) continue; - if (clip->passedict && clip->passedict->v.size[0] && !touch->v.size[0]) + if (clip->passedict!=0 && clip->passedict->v.size[0] && !touch->v.size[0]) continue; // points never interact // might intersect, so do an exact clip