expanded console buffer from 16k to 128k, and changed scroll amount to be dependent...

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index dbaf99cc4a82c37d1513a31ca2a1d54bb0612ad9..201cd783fdd6dd1976fadace1758a4daa5f6360c 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // quakedef.h -- primary header for client
 
+#ifndef QUAKEDEF_H
+#define QUAKEDEF_H
+
 #define QUAKE_GAME // as opposed to utilities
 
 #include <math.h>
@@ -28,44 +31,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <stdlib.h>
 #include <setjmp.h>
 
-extern char *buildstring;
-
-typedef unsigned char qbyte;
-
-#undef true
-#undef false
-
-typedef enum {false, true} qboolean;
-
-#ifndef NULL
-#define NULL ((void *)0)
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#define TRUE 1
-#endif
+#include "qtypes.h"
 
-//define       PARANOID                        // speed sapping error checking
-#ifdef _DEBUG
-#define ASSERT(condition) if (!(condition)) Sys_Error("assertion (##condition) failed at " __FILE__ ":" __LINE__ "\n");
-#else
-#define ASSERT(condition)
-#endif
+extern char *buildstring;
 
 #define GAMENAME "id1"
 
 #define MAX_NUM_ARGVS  50
 
-// up / down
-#define        PITCH   0
-
-// left / right
-#define        YAW             1
-
-// fall over
-#define        ROLL    2
-
 
 #define        MAX_QPATH               128                     // max length of a quake game pathname
 #define        MAX_OSPATH              1024            // max length of a filesystem pathname
@@ -222,35 +195,11 @@ typedef enum {false, true} qboolean;
 
 #include "portals.h"
 
-//=============================================================================
-
-// the host system specifies the base of the directory tree, the
-// command line parms passed to the program, and the amount of memory
-// available for the program to use
-
-typedef struct
-{
-       char    *basedir;
-#if CACHEENABLE
-       char    *cachedir;              // for development over ISDN lines
-#endif
-       int             argc;
-       char    **argv;
-} quakeparms_t;
-
-
-//=============================================================================
-
-
-
 extern qboolean noclip_anglehack;
 
-
 //
 // host
 //
-extern quakeparms_t host_parms;
-
 extern cvar_t          sys_ticrate;
 extern cvar_t          developer;
 
@@ -297,3 +246,6 @@ void fractalnoisequick(unsigned char *noise, int size, int startgrid);
 #include "image.h"
 
 void Sys_Shared_Init(void);
+
+#endif
+