From 20eec42a93d6ac7eeb56724bf4f170d3c6c8b58e Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Mon, 21 Jan 2002 19:10:01 +0000 Subject: [PATCH] allow keys.h to be used in QC --- include/QF/keys.h | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/include/QF/keys.h b/include/QF/keys.h index 87190c2c8..799b7e641 100644 --- a/include/QF/keys.h +++ b/include/QF/keys.h @@ -30,8 +30,12 @@ #ifndef _KEYS_H #define _KEYS_H -#include "QF/qtypes.h" -#include "QF/vfile.h" +#ifdef __QFCC__ +# define typedef +#else +# include "QF/qtypes.h" +# include "QF/vfile.h" +#endif // these are the key numbers that should be passed to Key_Event @@ -336,12 +340,6 @@ typedef enum { QFK_LAST } knum_t; -typedef struct -{ - int down[2]; // key nums holding it down - int state; // low bit is down state -} kbutton_t; - typedef enum { IMT_CONSOLE, IMT_0, @@ -367,6 +365,13 @@ typedef enum { // key_none should, preferably, be last typedef enum {key_game, key_console, key_message, key_menu, key_none} keydest_t; +#ifndef __QFCC__ +typedef struct +{ + int down[2]; // key nums holding it down + int state; // low bit is down state +} kbutton_t; + extern keydest_t key_dest; extern imt_t game_target; @@ -396,5 +401,6 @@ const char *Key_KeynumToString (knum_t keynum); extern char key_lines[32][MAXCMDLINE]; extern int edit_line; extern int key_linepos; +#endif #endif // _KEYS_H