added model_zymotic.h (forgot)

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index 7e0c8696e832ad3631aac29e4f1702d4c4727b9e..3aee507574eff07f720c5d0faef432655bfc54c3 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -19,19 +19,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // quakedef.h -- primary header for client
 
-//#define      GLTEST                  // experimental stuff
-
 #define        QUAKE_GAME                      // as opposed to utilities
 
-#define DP_VERSION                     1.05
-#define        VERSION                         1.09
-#define        GLQUAKE_VERSION         1.00
-#define        D3DQUAKE_VERSION        0.01
-#define        WINQUAKE_VERSION        0.996
-#define        LINUX_VERSION           1.30
-#define        X11_VERSION                     1.10
+#define        VERSION                         1.50
+extern int buildnumber;
+
+#ifndef FALSE
+#define FALSE 0
+#define TRUE 1
+#endif
 
 //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
 
 #define        GAMENAME        "id1"
 
@@ -42,44 +45,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <stdlib.h>
 #include <setjmp.h>
 
-#define id386  0
-
-
-#if defined(_WIN32) && !defined(WINDED)
-
-//#if defined(_M_IX86)
-//#define __i386__     1
-//#endif
-
-void   VID_LockBuffer (void);
-void   VID_UnlockBuffer (void);
-
-#else
-
-#define        VID_LockBuffer()
-#define        VID_UnlockBuffer()
-
-#endif
-
-//#if defined __i386__ // && !defined __sun__
-//#define id386        1
-//#else
-//#define id386        0
-//#endif
-
-#if id386
-#define UNALIGNED_OK   1       // set to 0 if unaligned accesses are not supported
-#else
-#define UNALIGNED_OK   0
-#endif
-
-// !!! if this is changed, it must be changed in d_ifacea.h too !!!
-#define CACHE_SIZE     32              // used to align key data structures
-
 #define UNUSED(x)      (x = x) // for pesky compiler / lint warnings
 
-#define        MINIMUM_MEMORY                  0x550000
-#define        MINIMUM_MEMORY_LEVELPAK (MINIMUM_MEMORY + 0x100000)
+// LordHavoc: default heap size (unless -heapsize (win32 only) or -mem is used), in megabytes
+#define DEFAULTMEM 24
+//#define      MINIMUM_MEMORY                  0x550000
+//#define      MINIMUM_MEMORY_LEVELPAK (MINIMUM_MEMORY + 0x100000)
 
 #define MAX_NUM_ARGVS  50
 
@@ -208,10 +179,6 @@ void       VID_UnlockBuffer (void);
 
 #define        SOUND_CHANNELS          8
 
-// This makes anyone on id's net privileged
-// Use for multiplayer testing only - VERY dangerous!!!
-// #define IDGODS
-
 #include "common.h"
 #include "bspfile.h"
 #include "vid.h"
@@ -299,16 +266,17 @@ extern    cvar_t          developer;
 
 extern qboolean        host_initialized;               // true if into command execution
 extern double          host_frametime;
-extern byte            *host_basepal;
-extern byte            *host_colormap;
+extern double          host_realframetime;     // LordHavoc: the real frametime, before slowmo and clamping are applied (used for console scrolling)
 extern int                     host_framecount;        // incremented every frame, never reset
 extern double          realtime;                       // not bounded in any way, changed at
                                                                                // start of every frame, never reset
 
+extern double          sv_frametime;
+
 void Host_ClearMemory (void);
 void Host_ServerFrame (void);
 void Host_InitCommands (void);
-void Host_Init (quakeparms_t *parms);
+void Host_Init ();
 void Host_Shutdown(void);
 void Host_Error (char *error, ...);
 void Host_EndGame (char *message, ...);
@@ -335,3 +303,8 @@ extern      cvar_t  chase_active;
 void Chase_Init (void);
 void Chase_Reset (void);
 void Chase_Update (void);
+
+void fractalnoise(unsigned char *noise, int size, int startgrid);
+
+#include "palette.h"
+#include "image.h"