X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=quakedef.h;h=54c7fe3a40667a112a86a8e059b63b8f34e8293a;hb=aa33d8f8642530f7f266d6cde1422f95aa74b2be;hp=a7c356203134a23a36b476100985aa296d11e90d;hpb=0631cd03cdfe0b948defbfc9d1f33ee4dc5d170c;p=xonotic%2Fdarkplaces.git diff --git a/quakedef.h b/quakedef.h index a7c35620..54c7fe3a 100644 --- a/quakedef.h +++ b/quakedef.h @@ -22,8 +22,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef QUAKEDEF_H #define QUAKEDEF_H -#define QUAKE_GAME // as opposed to utilities +#include +#include #include #include #include @@ -34,6 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "qtypes.h" extern char *buildstring; +extern char engineversion[128]; #define GAMENAME "id1" @@ -46,16 +48,16 @@ extern char *buildstring; #define ON_EPSILON 0.1 // point on plane side epsilon #define MAX_PACKETFRAGMENT 1024 // max length of packet fragment -// LordHavoc: this was 1024, now 65536 -#define MAX_DATAGRAM 65536 // max length of unreliable -#define MAX_NETRELIABLE 65536 // max length of reliable message (fragments into unreliable packets) +#define NET_MAXMESSAGE 65536 +#define NET_MINRATE 1000 // limits "rate" and "sv_maxrate" cvars +#define NET_MAXRATE 25000 // limits "rate" and "sv_maxrate" cvars // // per-level limits // // LordHavoc: increased entity limit to 2048 from 600 #define MAX_EDICTS 32768 // FIXME: ouch! ouch! ouch! -#define MAX_LIGHTSTYLES 64 +#define MAX_LIGHTSTYLES 256 // LordHavoc: increased model and sound limits from 256 and 256 to 4096 and 4096 (and added protocol extensions accordingly to break the 256 barrier) #define MAX_MODELS 4096 #define MAX_SOUNDS 4096 @@ -67,7 +69,7 @@ extern char *buildstring; // // stats are integers communicated to the client by the server // -#define MAX_CL_STATS 32 +#define MAX_CL_STATS 256 #define STAT_HEALTH 0 #define STAT_FRAGS 1 #define STAT_WEAPON 2 @@ -83,6 +85,11 @@ extern char *buildstring; #define STAT_TOTALMONSTERS 12 #define STAT_SECRETS 13 // bumped on client side by svc_foundsecret #define STAT_MONSTERS 14 // bumped by svc_killedmonster +#define STAT_ITEMS 15 // FTE, DP +#define STAT_VIEWHEIGHT 16 // FTE, DP +//#define STAT_TIME 17 // FTE +//#define STAT_VIEW2 20 // FTE +#define STAT_VIEWZOOM 21 // DP // stock defines @@ -117,22 +124,23 @@ extern char *buildstring; //=========================================== // AK nexuiz changed and added defines -#define NEX_IT_UZI 1 -#define NEX_IT_SHOTGUN 2 -#define NEX_IT_ELECTRO 8 -#define NEX_IT_CRYLINK 16 -#define NEX_IT_NEX 32 -#define NEX_IT_HAGAR 64 -#define NEX_IT_ROCKET_LAUNCHER 128 -#define NEX_IT_SHELLS 256 -#define NEX_IT_BULLETS 512 -#define NEX_IT_ROCKETS 1024 -#define NEX_IT_CELLS 2048 -#define NEX_IT_LASER 4094 -#define NEX_IT_STRENGTH 8192 -#define NEX_IT_INVINCIBLE 16384 -#define NEX_IT_SPEED 32767 -#define NEX_IT_SLOWMO 65536 +#define NEX_IT_UZI 1 +#define NEX_IT_SHOTGUN 2 +#define NEX_IT_GRENADE_LAUNCHER 4 +#define NEX_IT_ELECTRO 8 +#define NEX_IT_CRYLINK 16 +#define NEX_IT_NEX 32 +#define NEX_IT_HAGAR 64 +#define NEX_IT_ROCKET_LAUNCHER 128 +#define NEX_IT_SHELLS 256 +#define NEX_IT_BULLETS 512 +#define NEX_IT_ROCKETS 1024 +#define NEX_IT_CELLS 2048 +#define NEX_IT_LASER 4094 +#define NEX_IT_STRENGTH 8192 +#define NEX_IT_INVINCIBLE 16384 +#define NEX_IT_SPEED 32768 +#define NEX_IT_SLOWMO 65536 //=========================================== //rogue changed and added defines @@ -176,8 +184,6 @@ extern char *buildstring; // LordHavoc: increased name limit from 32 to 64 characters #define MAX_SCOREBOARDNAME 64 -#define SOUND_CHANNELS 8 - #include "zone.h" #include "fs.h" #include "common.h" @@ -189,7 +195,6 @@ extern char *buildstring; #include "r_textures.h" -#include "wad.h" #include "draw.h" #include "screen.h" #include "netconn.h" @@ -201,6 +206,7 @@ extern char *buildstring; #include "client.h" #include "render.h" #include "progs.h" +#include "progsvm.h" #include "server.h" #include "input.h" @@ -208,25 +214,18 @@ extern char *buildstring; #include "keys.h" #include "console.h" #include "menu.h" -#include "crc.h" -#include "cdaudio.h" #include "glquake.h" #include "ui.h" +#include "palette.h" extern qboolean noclip_anglehack; -// -// host -// -extern cvar_t sys_ticrate; extern cvar_t developer; -// true if into command execution -extern qboolean host_initialized; extern double host_frametime; -// LordHavoc: the real frametime, before slowmo and clamping are applied (used for console scrolling) +// the real frametime, before slowmo and clamping are applied (used for console scrolling) extern double host_realframetime; // incremented every frame, never reset extern int host_framecount; @@ -237,19 +236,19 @@ void Host_ClearMemory(void); void Host_InitCommands(void); void Host_Init(void); void Host_Shutdown(void); +void Host_StartVideo(void); void Host_Error(const char *error, ...); -void Host_EndGame(const char *message, ...); void Host_Frame(float time); void Host_Quit_f(void); void Host_ClientCommands(const char *fmt, ...); void Host_ShutdownServer(qboolean crash); void Host_Reconnect_f(void); +void Host_AbortCurrentFrame(void); + // skill level for currently loaded level (in case the user changes the cvar while the level is running, this reflects the level actually in use) extern int current_skill; -extern int minimum_memory; - // // chase // @@ -262,8 +261,6 @@ void Chase_Update (void); void fractalnoise(unsigned char *noise, int size, int startgrid); void fractalnoisequick(unsigned char *noise, int size, int startgrid); -#include "palette.h" - void Sys_Shared_Init(void); #endif