X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=protocol.h;h=047262d6a979604c1cefb5096f141674bdd8b2ab;hp=8897e92fb24a77344dc8a8638f32b961a67c75f1;hb=9becec9419d9a20c7d373b14e1106d5f0ce78494;hpb=f489a657f28418efa08ca8907f5f78e17b44655f diff --git a/protocol.h b/protocol.h index 8897e92f..047262d6 100644 --- a/protocol.h +++ b/protocol.h @@ -22,23 +22,49 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef PROTOCOL_H #define PROTOCOL_H +#include +#include "qtypes.h" +#include "qdefs.h" +#include "qstats.h" +struct mempool_s; +struct sizebuf_s; // protocolversion_t is defined in common.h +enum protocolversion_e; -protocolversion_t Protocol_EnumForName(const char *s); -const char *Protocol_NameForEnum(protocolversion_t p); -protocolversion_t Protocol_EnumForNumber(int n); -int Protocol_NumberForEnum(protocolversion_t p); +enum protocolversion_e Protocol_EnumForName(const char *s); +const char *Protocol_NameForEnum(enum protocolversion_e p); +enum protocolversion_e Protocol_EnumForNumber(int n); +int Protocol_NumberForEnum(enum protocolversion_e p); void Protocol_Names(char *buffer, size_t buffersize); +#define ENTITYSIZEPROFILING_START(msg, num, flags) \ + int entityprofiling_startsize = msg->cursize + +#define ENTITYSIZEPROFILING_END(msg, num, flags) \ + if(developer_networkentities.integer >= 2) \ + { \ + prvm_edict_t *edict = prog->edicts + num; \ + Con_Printf("sent entity update of size %u for %d classname %s flags %d\n", (msg->cursize - entityprofiling_startsize), num, PRVM_serveredictstring(edict, classname) ? PRVM_GetString(prog, PRVM_serveredictstring(edict, classname)) : "(no classname)", flags); \ + } + +// CSQC entity scope values. Bitflags! +#define SCOPE_WANTREMOVE 1 // Set if a remove has been scheduled. Never set together with WANTUPDATE. +#define SCOPE_WANTUPDATE 2 // Set if an update has been scheduled. +#define SCOPE_WANTSEND (SCOPE_WANTREMOVE | SCOPE_WANTUPDATE) +#define SCOPE_EXISTED_ONCE 4 // Set if the entity once existed. All these get resent on a full loss. +#define SCOPE_ASSUMED_EXISTING 8 // Set if the entity is currently assumed existing and therefore needs removes. + + // model effects -#define EF_ROCKET 1 // leave a trail -#define EF_GRENADE 2 // leave a trail -#define EF_GIB 4 // leave a trail -#define EF_ROTATE 8 // rotate (bonus items) -#define EF_TRACER 16 // green split trail -#define EF_ZOMGIB 32 // small blood trail -#define EF_TRACER2 64 // orange split trail + rotate -#define EF_TRACER3 128 // purple trail +#define MF_ROCKET 1 // leave a trail +#define MF_GRENADE 2 // leave a trail +#define MF_GIB 4 // leave a trail +#define MF_ROTATE 8 // rotate (bonus items) +#define MF_TRACER 16 // green split trail +#define MF_ZOMGIB 32 // small blood trail +#define MF_TRACER2 64 // orange split trail + rotate +#define MF_TRACER3 128 // purple trail + // entity effects #define EF_BRIGHTFIELD 1 #define EF_MUZZLEFLASH 2 @@ -48,21 +74,34 @@ void Protocol_Names(char *buffer, size_t buffersize); #define EF_ADDITIVE 32 #define EF_BLUE 64 #define EF_RED 128 -#define EF_DELTA 8388608 // LordHavoc: (obsolete) entity is delta compressed to save network bandwidth (no longer used) -#define EF_LOWPRECISION 4194304 // LordHavoc: entity is low precision (integer coordinates) to save network bandwidth -// effects/model (can be used as model flags or entity effects) -#define EF_REFLECTIVE 256 // LordHavoc: shiny metal objects :) (not currently supported) -#define EF_FULLBRIGHT 512 // LordHavoc: fullbright -#define EF_FLAME 1024 // LordHavoc: on fire -#define EF_STARDUST 2048 // LordHavoc: showering sparks -#define EF_NOSHADOW 4096 // LordHavoc: does not cast a shadow -#define EF_NODEPTHTEST 8192 // LordHavoc: shows through walls -#define EF_SELECTABLE 16384 // LordHavoc: highlights when PRYDON_CLIENTCURSOR mouse is over it -#define EF_DOUBLESIDED 32768 //[515]: disable cull face for this entity - -#define EF_FLAG1QW 16777216 // internal client use only -#define EF_FLAG2QW 33554432 // internal client use only -#define EF_STEP 0x80000000 // internal client use only - present on MOVETYPE_STEP entities, not QC accessible (too many bits) +#define EF_NOGUNBOB 256 // LadyHavoc: when used with .viewmodelforclient this makes the entity attach to the view without gun bobbing and such effects, it also works on the player entity to disable gun bobbing of the engine-managed .viewmodel (without affecting any .viewmodelforclient entities attached to the player) +#define EF_FULLBRIGHT 512 // LadyHavoc: fullbright +#define EF_FLAME 1024 // LadyHavoc: on fire +#define EF_STARDUST 2048 // LadyHavoc: showering sparks +#define EF_NOSHADOW 4096 // LadyHavoc: does not cast a shadow +#define EF_NODEPTHTEST 8192 // LadyHavoc: shows through walls +#define EF_SELECTABLE 16384 // LadyHavoc: highlights when PRYDON_CLIENTCURSOR mouse is over it +#define EF_DOUBLESIDED 32768 //[515]: disable cull face for this entity +#define EF_NOSELFSHADOW 65536 // LadyHavoc: does not cast a shadow on itself (or any other EF_NOSELFSHADOW entities) +#define EF_DYNAMICMODELLIGHT 131072 +#define EF_UNUSED18 262144 +#define EF_UNUSED19 524288 +#define EF_RESTARTANIM_BIT 1048576 // div0: restart animation bit (like teleport bit, but lerps between end and start of the anim, and doesn't stop player lerping) +#define EF_TELEPORT_BIT 2097152 // div0: teleport bit (toggled when teleporting, prevents lerping when the bit has changed) +#define EF_LOWPRECISION 4194304 // LadyHavoc: entity is low precision (integer coordinates) to save network bandwidth (serverside only) +#define EF_NOMODELFLAGS 8388608 // indicates the model's .effects should be ignored (allows overriding them) +#define EF_ROCKET 16777216 // leave a trail +#define EF_GRENADE 33554432 // leave a trail +#define EF_GIB 67108864 // leave a trail +#define EF_ROTATE 134217728 // rotate (bonus items) +#define EF_TRACER 268435456 // green split trail +#define EF_ZOMGIB 536870912 // small blood trail +#define EF_TRACER2 1073741824 // orange split trail + rotate +#define EF_TRACER3 0x80000000 // purple trail + +// internaleffects bits (no overlap with EF_ bits): +#define INTEF_FLAG1QW 1 +#define INTEF_FLAG2QW 2 // flags for the pflags field of entities #define PFLAGS_NOSHADOW 1 @@ -75,7 +114,7 @@ void Protocol_Names(char *buffer, size_t buffersize); #define U_ORIGIN2 (1<<2) #define U_ORIGIN3 (1<<3) #define U_ANGLE2 (1<<4) -// LordHavoc: U_NOLERP was only ever used for monsters, so I renamed it U_STEP +// LadyHavoc: U_NOLERP was only ever used for monsters, so I renamed it U_STEP #define U_STEP (1<<5) #define U_FRAME (1<<6) // just differentiates from other updates @@ -89,9 +128,9 @@ void Protocol_Names(char *buffer, size_t buffersize); #define U_EFFECTS (1<<13) #define U_LONGENTITY (1<<14) -// LordHavoc: protocol extension +// LadyHavoc: protocol extension #define U_EXTEND1 (1<<15) -// LordHavoc: first extend byte +// LadyHavoc: first extend byte #define U_DELTA (1<<16) // no data, while this is set the entity is delta compressed (uses previous frame as a baseline, meaning only things that have changed from the previous frame are sent, except for the forced full update every half second) #define U_ALPHA (1<<17) // 1 byte, 0.0-1.0 maps to 0-255, not sent if exactly 1, and the entity is not sent if <=0 unless it has effects (model effects are checked as well) #define U_SCALE (1<<18) // 1 byte, scale / 16 positive, not sent if 1.0 @@ -100,7 +139,7 @@ void Protocol_Names(char *buffer, size_t buffersize); #define U_GLOWCOLOR (1<<21) // 1 byte, palette index, default is 254 (white), this IS used for darklight (allowing colored darklight), however the particles from a darklight are always black, not sent if default value (even if glowsize or glowtrail is set) #define U_COLORMOD (1<<22) // 1 byte, 3 bit red, 3 bit green, 2 bit blue, this lets you tint an object artifically, so you could make a red rocket, or a blue fiend... #define U_EXTEND2 (1<<23) // another byte to follow -// LordHavoc: second extend byte +// LadyHavoc: second extend byte #define U_GLOWTRAIL (1<<24) // leaves a trail of particles (of color .glowcolor, or black if it is a negative glowsize) #define U_VIEWMODEL (1<<25) // attachs the model to the view (origin and angles become relative to it), only shown to owner, a more powerful alternative to .weaponmodel and such #define U_FRAME2 (1<<26) // 1 byte, this is .frame & 0xFF00 (second byte) @@ -151,6 +190,7 @@ void Protocol_Names(char *buffer, size_t buffersize); #define SND_LOOPING (1<<2) // a long #define SND_LARGEENTITY (1<<3) // a short and a byte (instead of a short) #define SND_LARGESOUND (1<<4) // a short (instead of a byte) +#define SND_SPEEDUSHORT4000 (1<<5) // ushort speed*4000 (speed is usually 1.0, a value of 0.0 is the same as 1.0) // defaults for clientinfo messages @@ -224,7 +264,7 @@ void Protocol_Names(char *buffer, size_t buffersize); #define svc_hidelmp 36 // [string] slotname #define svc_skybox 37 // [string] skyname -// LordHavoc: my svc_ range, 50-69 +// LadyHavoc: my svc_ range, 50-69 #define svc_downloaddata 50 // [int] start [short] size #define svc_updatestatubyte 51 // [byte] stat [byte] value #define svc_effect 52 // [vector] org [byte] modelindex [byte] startframe [byte] framecount [byte] framerate @@ -237,7 +277,8 @@ void Protocol_Names(char *buffer, size_t buffersize); #define svc_csqcentities 58 // [short] entnum [variable length] entitydata ... [short] 0x0000 #define svc_spawnstaticsound2 59 // [coord3] [short] samp [byte] vol [byte] aten #define svc_trailparticles 60 // [short] entnum [short] effectnum [vector] start [vector] end -#define svc_pointparticles 61 // [short] effectnum [vector] start [vector] end [short] count +#define svc_pointparticles 61 // [short] effectnum [vector] start [vector] velocity [short] count +#define svc_pointparticles1 62 // [short] effectnum [vector] start, same as svc_pointparticles except velocity is zero and count is 1 // // client to server @@ -248,7 +289,7 @@ void Protocol_Names(char *buffer, size_t buffersize); #define clc_move 3 // [usercmd_t] #define clc_stringcmd 4 // [string] message -// LordHavoc: my clc_ range, 50-59 +// LadyHavoc: my clc_ range, 50-59 #define clc_ackframe 50 // [int] framenumber #define clc_ackdownloaddata 51 // [int] start [short] size (note: exact echo of latest values received in svc_downloaddata, packet-loss handling is in the server) #define clc_unusedlh2 52 @@ -285,7 +326,7 @@ void Protocol_Names(char *buffer, size_t buffersize); #define TE_EXPLOSION3 16 // [vector] origin [coord] red [coord] green [coord] blue #define TE_LIGHTNING4NEH 17 // [string] model [entity] entity [vector] start [vector] end -// LordHavoc: added some TE_ codes (block1 - 50-60) +// LadyHavoc: added some TE_ codes (block1 - 50-60) #define TE_BLOOD 50 // [vector] origin [byte] xvel [byte] yvel [byte] zvel [byte] count #define TE_SPARK 51 // [vector] origin [byte] xvel [byte] yvel [byte] zvel [byte] count #define TE_BLOODSHOWER 52 // [vector] min [vector] max [coord] explosionspeed [short] count @@ -296,14 +337,14 @@ void Protocol_Names(char *buffer, size_t buffersize); #define TE_GUNSHOTQUAD 57 // [vector] origin #define TE_SPIKEQUAD 58 // [vector] origin #define TE_SUPERSPIKEQUAD 59 // [vector] origin -// LordHavoc: block2 - 70-80 +// LadyHavoc: block2 - 70-80 #define TE_EXPLOSIONQUAD 70 // [vector] origin #define TE_UNUSED1 71 // unused #define TE_SMALLFLASH 72 // [vector] origin #define TE_CUSTOMFLASH 73 // [vector] origin [byte] radius / 8 - 1 [byte] lifetime / 256 - 1 [byte] red [byte] green [byte] blue #define TE_FLAMEJET 74 // [vector] origin [vector] velocity [byte] count #define TE_PLASMABURN 75 // [vector] origin -// LordHavoc: Tei grabbed these codes +// LadyHavoc: Tei grabbed these codes #define TE_TEI_G3 76 // [vector] start [vector] end [vector] angles #define TE_TEI_SMOKE 77 // [vector] origin [vector] dir [byte] count #define TE_TEI_BIGEXPLOSION 78 // [vector] origin @@ -317,19 +358,93 @@ void Protocol_Names(char *buffer, size_t buffersize); #define RENDER_EXTERIORMODEL 8 #define RENDER_LOWPRECISION 16 // send as low precision coordinates to save bandwidth #define RENDER_COLORMAPPED 32 +#define RENDER_WORLDOBJECT 64 // do not cull this entity with r_cullentities +#define RENDER_COMPLEXANIMATION 128 + #define RENDER_SHADOW 65536 // cast shadow #define RENDER_LIGHT 131072 // receive light +#define RENDER_NOSELFSHADOW 262144 // render lighting on this entity before its own shadow is added to the scene +// (note: all RENDER_NOSELFSHADOW entities are grouped together and rendered in a batch before their shadows are rendered, so they can not shadow eachother either) +#define RENDER_NODEPTHTEST 1048576 +#define RENDER_ADDITIVE 2097152 +#define RENDER_DOUBLESIDED 4194304 +#define RENDER_CUSTOMIZEDMODELLIGHT 4096 +#define RENDER_DYNAMICMODELLIGHT 8388608 // origin dependent model light + +typedef struct usercmd_s +{ + vec3_t viewangles; + +// intended velocities + float forwardmove; + float sidemove; + float upmove; + + vec3_t cursor_screen; + vec3_t cursor_start; + vec3_t cursor_end; + vec3_t cursor_impact; + vec3_t cursor_normal; + vec_t cursor_fraction; + int cursor_entitynumber; + + double time; // time the move is executed for (non-cl_movement is executed at receivetime) + float receivetime; // time the move was received at (used for ping) + unsigned char msec; // for predicted moves + int buttons; + int impulse; + unsigned int sequence; + qbool applied; // if false we're still accumulating a move + qbool predicted; // if true the sequence should be sent as 0 + + // derived properties + double frametime; + qbool canjump; + qbool jump; + qbool crouch; +} usercmd_t; + +#define MAX_FRAMEGROUPBLENDS 4 +typedef struct framegroupblend_s +{ + // animation number and blend factor + // (for most models this is the frame number) + int frame; + float lerp; + // time frame began playing (for framegroup animations) + double start; +} +framegroupblend_t; + +struct matrix4x4_s; +struct model_s; + +typedef struct skeleton_s +{ + const struct model_s *model; + struct matrix4x4_s *relativetransforms; +} +skeleton_t; + +typedef enum entity_state_active_e +{ + ACTIVE_NOT = 0, + ACTIVE_NETWORK = 1, + ACTIVE_SHARED = 2 +} +entity_state_active_t; -// this is 88 bytes +// this was 96 bytes, now 168 bytes (32bit) or 176 bytes (64bit) typedef struct entity_state_s { // ! means this is not sent to client double time; // ! time this state was built (used on client for interpolation) + float netcenter[3]; // ! for network prioritization, this is the center of the bounding box (which may differ from the origin) float origin[3]; float angles[3]; - int number; // entity number this state is for int effects; unsigned int customizeentityforclient; // ! + unsigned short number; // entity number this state is for unsigned short modelindex; unsigned short frame; unsigned short tagentity; @@ -338,6 +453,7 @@ typedef struct entity_state_s unsigned short exteriormodelforclient; // ! not shown if first person viewing from this entity, shown in all other cases unsigned short nodrawtoclient; // ! unsigned short drawonlytoclient; // ! + unsigned short traileffectnum; unsigned short light[4]; // color*256 (0.00 to 255.996), and radius*1 unsigned char active; // true if a valid state unsigned char lightstyle; @@ -349,10 +465,13 @@ typedef struct entity_state_s unsigned char glowsize; unsigned char glowcolor; unsigned char flags; + unsigned char internaleffects; // INTEF_FLAG1QW and so on unsigned char tagindex; unsigned char colormod[3]; - // padding to a multiple of 8 bytes (to align the double time) - unsigned char unused[6]; + unsigned char glowmod[3]; + // LadyHavoc: very big data here :( + framegroupblend_t framegroupblend[4]; + skeleton_t skeletonobject; } entity_state_t; @@ -360,9 +479,16 @@ entity_state_t; extern entity_state_t defaultstate; // reads a quake entity from the network stream void EntityFrameQuake_ReadEntity(int bits); +// checks for stats changes and sets corresponding host_client->statsdeltabits +// (also updates host_client->stats array) +void Protocol_UpdateClientStats(const int *stats); +// writes reliable messages updating stats (not used by DP6 and later +// protocols which send updates in their WriteFrame function using a different +// method of reliable messaging) +void Protocol_WriteStatsReliable(void); // writes a list of quake entities to the network stream // (or as many will fit) -void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int numstates, const entity_state_t *states); +qbool EntityFrameQuake_WriteFrame(struct sizebuf_s *msg, int maxsize, int numstates, const entity_state_t **states); // cleans up dead entities each frame after ReadEntity (which doesn't clear unused entities) void EntityFrameQuake_ISeeDeadEntities(void); @@ -423,6 +549,22 @@ the Write function performs these steps: server updates entities in looping ranges, a frame consists of a range of visible entities (not always all visible entities), */ +#define MAX_ENTITY_HISTORY 64 +#define MAX_ENTITY_DATABASE (MAX_EDICTS * 2) + +// build entity data in this, to pass to entity read/write functions +typedef struct entity_frame_s +{ + double time; + int framenum; + int numentities; + int firstentitynum; + int lastentitynum; + vec3_t eye; + entity_state_t entitydata[MAX_ENTITY_DATABASE]; +} +entity_frame_t; + typedef struct entity_frameinfo_s { double time; @@ -432,9 +574,6 @@ typedef struct entity_frameinfo_s } entity_frameinfo_t; -#define MAX_ENTITY_HISTORY 64 -#define MAX_ENTITY_DATABASE (MAX_EDICTS * 2) - typedef struct entityframe_database_s { // note: these can be far out of range, modulo with MAX_ENTITY_DATABASE to get a valid range (which may wrap) @@ -456,23 +595,14 @@ typedef struct entityframe_database_s entity_frameinfo_t frames[MAX_ENTITY_HISTORY]; // entities entity_state_t entitydata[MAX_ENTITY_DATABASE]; -} -entityframe_database_t; -// build entity data in this, to pass to entity read/write functions -typedef struct entity_frame_s -{ - double time; - int framenum; - int numentities; - int firstentitynum; - int lastentitynum; - vec3_t eye; - entity_state_t entitydata[MAX_ENTITY_DATABASE]; + // structs for building new frames and reading them + entity_frame_t deltaframe; + entity_frame_t framedata; } -entity_frame_t; +entityframe_database_t; -// LordHavoc: these are in approximately sorted order, according to cost and +// LadyHavoc: these are in approximately sorted order, according to cost and // likelyhood of being used for numerous objects in a frame // note that the bytes are not written/read in this order, this is only the @@ -520,18 +650,18 @@ entity_frame_t; // returns difference between two states as E_ flags int EntityState_DeltaBits(const entity_state_t *o, const entity_state_t *n); // write E_ flags to a msg -void EntityState_WriteExtendBits(sizebuf_t *msg, unsigned int bits); +void EntityState_WriteExtendBits(struct sizebuf_s *msg, unsigned int bits); // write values for the E_ flagged fields to a msg -void EntityState_WriteFields(const entity_state_t *ent, sizebuf_t *msg, unsigned int bits); +void EntityState_WriteFields(const entity_state_t *ent, struct sizebuf_s *msg, unsigned int bits); // write entity number and E_ flags and their values, or a remove number, describing the change from delta to ent -void EntityState_WriteUpdate(const entity_state_t *ent, sizebuf_t *msg, const entity_state_t *delta); +void EntityState_WriteUpdate(const entity_state_t *ent, struct sizebuf_s *msg, const entity_state_t *delta); // read E_ flags int EntityState_ReadExtendBits(void); // read values for E_ flagged fields and apply them to a state void EntityState_ReadFields(entity_state_t *e, unsigned int bits); // (client and server) allocates a new empty database -entityframe_database_t *EntityFrame_AllocDatabase(mempool_t *mempool); +entityframe_database_t *EntityFrame_AllocDatabase(struct mempool_s *mempool); // (client and server) frees the database void EntityFrame_FreeDatabase(entityframe_database_t *d); // (server) clears the database to contain no frames (thus delta compression @@ -543,11 +673,12 @@ void EntityFrame_AckFrame(entityframe_database_t *d, int frame); void EntityFrame_Clear(entity_frame_t *f, vec3_t eye, int framenum); // (server and client) reads a frame from the database void EntityFrame_FetchFrame(entityframe_database_t *d, int framenum, entity_frame_t *f); -// (server and client) adds a entity_frame to the database, for future -// reference -void EntityFrame_AddFrame(entityframe_database_t *d, vec3_t eye, int framenum, int numentities, const entity_state_t *entitydata); +// (client) adds a entity_frame to the database, for future reference +void EntityFrame_AddFrame_Client(entityframe_database_t *d, vec3_t eye, int framenum, int numentities, const entity_state_t *entitydata); +// (server) adds a entity_frame to the database, for future reference +void EntityFrame_AddFrame_Server(entityframe_database_t *d, vec3_t eye, int framenum, int numentities, const entity_state_t **entitydata); // (server) writes a frame to network stream -void EntityFrame_WriteFrame(sizebuf_t *msg, entityframe_database_t *d, int numstates, const entity_state_t *states, int viewentnum); +qbool EntityFrame_WriteFrame(struct sizebuf_s *msg, int maxsize, entityframe_database_t *d, int numstates, const entity_state_t **states, int viewentnum); // (client) reads a frame from network stream void EntityFrame_CL_ReadFrame(void); // (client) returns the frame number of the most recent frame recieved @@ -568,7 +699,7 @@ entity_database4_commit_t; typedef struct entity_database4_s { // what mempool to use for allocations - mempool_t *mempool; + struct mempool_s *mempool; // reference frame int referenceframenum; // reference entities array is resized according to demand @@ -593,7 +724,7 @@ entity_state_t *EntityFrame4_GetReferenceEntity(entityframe4_database_t *d, int void EntityFrame4_AddCommitEntity(entityframe4_database_t *d, const entity_state_t *s); // allocate a database -entityframe4_database_t *EntityFrame4_AllocDatabase(mempool_t *pool); +entityframe4_database_t *EntityFrame4_AllocDatabase(struct mempool_s *pool); // free a database void EntityFrame4_FreeDatabase(entityframe4_database_t *d); // reset a database (resets compression but does not reallocate anything) @@ -601,7 +732,7 @@ void EntityFrame4_ResetDatabase(entityframe4_database_t *d); // updates database to account for a frame-received acknowledgment int EntityFrame4_AckFrame(entityframe4_database_t *d, int framenum, int servermode); // writes a frame to the network stream -void EntityFrame4_WriteFrame(sizebuf_t *msg, entityframe4_database_t *d, int numstates, const entity_state_t *states); +qbool EntityFrame4_WriteFrame(struct sizebuf_s *msg, int maxsize, entityframe4_database_t *d, int numstates, const entity_state_t **states); // reads a frame from the network stream void EntityFrame4_CL_ReadFrame(void); @@ -667,12 +798,17 @@ void EntityFrame4_CL_ReadFrame(void); // bits >= (1<<24) #define E5_EXTEND3 (1<<23) -// unused -#define E5_UNUSED24 (1<<24) -// unused -#define E5_UNUSED25 (1<<25) -// unused -#define E5_UNUSED26 (1<<26) +// byte[3] = s->glowmod[0], s->glowmod[1], s->glowmod[2] +#define E5_GLOWMOD (1<<24) +// byte type=0 short frames[1] short times[1] +// byte type=1 short frames[2] short times[2] byte lerps[2] +// byte type=2 short frames[3] short times[3] byte lerps[3] +// byte type=3 short frames[4] short times[4] byte lerps[4] +// byte type=4 short modelindex byte numbones {short pose7s[7]} +// see also RENDER_COMPLEXANIMATION +#define E5_COMPLEXANIMATION (1<<25) +// ushort traileffectnum +#define E5_TRAILEFFECTNUM (1<<26) // unused #define E5_UNUSED27 (1<<27) // unused @@ -686,6 +822,7 @@ void EntityFrame4_CL_ReadFrame(void); #define ENTITYFRAME5_MAXPACKETLOGS 64 #define ENTITYFRAME5_MAXSTATES 1024 +#define ENTITYFRAME5_PRIORITYLEVELS 32 typedef struct entityframe5_changestate_s { @@ -731,10 +868,6 @@ typedef struct entityframe5_database_s // (derived from states) unsigned char *visiblebits; // [(maxedicts+7)/8] - // delta compression of stats - unsigned char statsdeltabits[(MAX_CL_STATS+7)/8]; - int stats[MAX_CL_STATS]; - // old notes // this is used to decide which changestates to set each frame @@ -747,19 +880,23 @@ typedef struct entityframe5_database_s // rather than a memmove to remove them from the start. //int numchangestates; //entityframe5_changestate_t changestates[MAX_EDICTS]; + + // buffers for building priority info + int prioritychaincounts[ENTITYFRAME5_PRIORITYLEVELS]; + unsigned short prioritychains[ENTITYFRAME5_PRIORITYLEVELS][ENTITYFRAME5_MAXSTATES]; } entityframe5_database_t; -entityframe5_database_t *EntityFrame5_AllocDatabase(mempool_t *pool); +entityframe5_database_t *EntityFrame5_AllocDatabase(struct mempool_s *pool); void EntityFrame5_FreeDatabase(entityframe5_database_t *d); -void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbits, sizebuf_t *msg); +void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbits, struct sizebuf_s *msg); int EntityState5_DeltaBitsForState(entity_state_t *o, entity_state_t *n); void EntityFrame5_CL_ReadFrame(void); void EntityFrame5_LostFrame(entityframe5_database_t *d, int framenum); void EntityFrame5_AckFrame(entityframe5_database_t *d, int framenum); -void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int numstates, const entity_state_t *states, int viewentnum, int *stats, int movesequence); +qbool EntityFrame5_WriteFrame(struct sizebuf_s *msg, int maxsize, entityframe5_database_t *d, int numstates, const entity_state_t **states, int viewentnum, unsigned int movesequence, qbool need_empty); -extern cvar_t developer_networkentities; +extern struct cvar_s developer_networkentities; // QUAKEWORLD // server to client @@ -919,7 +1056,7 @@ extern cvar_t developer_networkentities; typedef struct entityframeqw_snapshot_s { double time; - qboolean invalid; + qbool invalid; int num_entities; entity_state_t entities[QW_MAX_PACKET_ENTITIES]; } @@ -931,10 +1068,14 @@ typedef struct entityframeqw_database_s } entityframeqw_database_t; -entityframeqw_database_t *EntityFrameQW_AllocDatabase(mempool_t *pool); +entityframeqw_database_t *EntityFrameQW_AllocDatabase(struct mempool_s *pool); void EntityFrameQW_FreeDatabase(entityframeqw_database_t *d); void EntityStateQW_ReadPlayerUpdate(void); -void EntityFrameQW_CL_ReadFrame(qboolean delta); +void EntityFrameQW_CL_ReadFrame(qbool delta); + +struct client_s; +void EntityFrameCSQC_LostFrame(struct client_s *client, int framenum); +qbool EntityFrameCSQC_WriteFrame (struct sizebuf_s *msg, int maxsize, int numnumbers, const unsigned short *numbers, int framenum); #endif