X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=quakedef.h;h=85760abad582bb32b6c2029c71990b0c9bba651e;hb=54c9d0986ce2000adcf80d200b18d22db4f1fd93;hp=8b4d26af240dc0cb7ea7eccfd41369242d83629d;hpb=9f6e4476fe8049342ac61c87ab7286912c1ff97c;p=xonotic%2Fdarkplaces.git diff --git a/quakedef.h b/quakedef.h index 8b4d26af..85760aba 100644 --- a/quakedef.h +++ b/quakedef.h @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -19,11 +19,23 @@ 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 QUAKE_GAME // as opposed to utilities +extern char *buildstring; -#define VERSION 1.05 +#if !defined BYTE_DEFINED +typedef unsigned char byte; +#define BYTE_DEFINED 1 +#endif + +#undef true +#undef false + +typedef enum {false, true} qboolean; + +#ifndef NULL +#define NULL ((void *)0) +#endif #ifndef FALSE #define FALSE 0 @@ -31,8 +43,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #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" +#define GAMENAME "id1" #include #include @@ -41,11 +58,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#define UNUSED(x) (x = x) // for pesky compiler / lint warnings - -#define MINIMUM_MEMORY 0x550000 -#define MINIMUM_MEMORY_LEVELPAK (MINIMUM_MEMORY + 0x100000) - #define MAX_NUM_ARGVS 50 // up / down @@ -58,8 +70,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define ROLL 2 -#define MAX_QPATH 64 // max length of a quake game pathname -#define MAX_OSPATH 128 // max length of a filesystem pathname +#define MAX_QPATH 128 // max length of a quake game pathname +#define MAX_OSPATH 1024 // max length of a filesystem pathname #define ON_EPSILON 0.1 // point on plane side epsilon @@ -73,8 +85,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // LordHavoc: increased entity limit to 2048 from 600 #define MAX_EDICTS 2048 // FIXME: ouch! ouch! ouch! #define MAX_LIGHTSTYLES 64 -#define MAX_MODELS 256 // these are sent over the net as bytes -#define MAX_SOUNDS 256 // so they cannot be blindly increased +// LordHavoc: increased model and sound limits from 256 and 256 to 1024 and 1024 (and added protocol extensions accordingly) +#define MAX_MODELS 1024 // these are sent over the net as bytes +#define MAX_SOUNDS 1024 // so they cannot be blindly increased #define SAVEGAME_COMMENT_LENGTH 39 @@ -173,58 +186,45 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SOUND_CHANNELS 8 +#include "zone.h" +#include "quakeio.h" #include "common.h" +#include "cvar.h" #include "bspfile.h" #include "vid.h" #include "sys.h" -#include "zone.h" #include "mathlib.h" -// LordHavoc: made this more compact, and added some more fields -typedef struct -{ - vec3_t origin; - vec3_t angles; - int effects; - short modelindex; - short frame; - byte colormap; - byte skin; - byte alpha; - byte scale; - byte glowsize; - byte glowcolor; - byte colormod; -} entity_state_t; - +#include "r_textures.h" #include "wad.h" #include "draw.h" -#include "cvar.h" #include "screen.h" #include "net.h" #include "protocol.h" #include "cmd.h" #include "sbar.h" #include "sound.h" -#include "render.h" +#include "model_shared.h" #include "client.h" +#include "render.h" #include "progs.h" #include "server.h" -#include "model_shared.h" - #include "input.h" #include "world.h" #include "keys.h" #include "console.h" -#include "view.h" #include "menu.h" #include "crc.h" #include "cdaudio.h" #include "glquake.h" +#include "ui.h" + +#include "portals.h" + //============================================================================= // the host system specifies the base of the directory tree, the @@ -234,11 +234,11 @@ typedef struct typedef struct { char *basedir; +#if CACHEENABLE char *cachedir; // for development over ISDN lines +#endif int argc; char **argv; - void *membase; - int memsize; } quakeparms_t; @@ -255,23 +255,19 @@ extern qboolean noclip_anglehack; extern quakeparms_t host_parms; extern cvar_t sys_ticrate; -extern cvar_t sys_nostdout; 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); void Host_Shutdown(void); void Host_Error (char *error, ...); void Host_EndGame (char *message, ...); @@ -286,8 +282,6 @@ extern int current_skill; // 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 qboolean isDedicated; - extern int minimum_memory; // @@ -298,3 +292,11 @@ 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); +void fractalnoisequick(byte *noise, int size, int startgrid); + +#include "palette.h" +#include "image.h" + +void Sys_Shared_Init(void);