added error messages when opening sockets (reports both success and failure)

[xonotic/darkplaces.git] / protocol.h

diff --git a/protocol.h b/protocol.h
index 35e51a171c14f0dc6409fac49a9f782360158f2c..9ec2011421bde66d3da630676deb2807529e561f 100644 (file)
--- a/protocol.h
+++ b/protocol.h
@@ -317,6 +317,12 @@ typedef struct
        unsigned short modelindex;
        unsigned short frame;
        unsigned short effects;
+       unsigned short tagentity;
+       unsigned short specialvisibilityradius;
+       unsigned short viewmodelforclient;
+       unsigned short exteriormodelforclient;
+       unsigned short nodrawtoclient;
+       unsigned short drawonlytoclient;
        qbyte colormap;
        qbyte skin;
        qbyte alpha;
@@ -324,6 +330,7 @@ typedef struct
        qbyte glowsize;
        qbyte glowcolor;
        qbyte flags;
+       qbyte tagindex;
 }
 entity_state_t;
 
@@ -470,13 +477,16 @@ entity_frame_t;
 #define E_SOUND1               (1<<24)
 #define E_SOUNDVOL             (1<<25)
 #define E_SOUNDATTEN   (1<<26)
-#define E_UNUSED4              (1<<27)
+#define E_TAGATTACHMENT        (1<<27)
 #define E_UNUSED5              (1<<28)
 #define E_UNUSED6              (1<<29)
 #define E_UNUSED7              (1<<30)
 #define E_EXTEND4              (1<<31)
 
+// clears a state to baseline values
 void ClearStateToDefault(entity_state_t *s);
+// used by some of the DP protocols
+void EntityState_Write(entity_state_t *ent, sizebuf_t *msg, entity_state_t *delta);
 
 // (server) clears the database to contain no frames (thus delta compression
 // compresses against nothing)
@@ -484,9 +494,9 @@ void EntityFrame_ClearDatabase(entity_database_t *d);
 // (server and client) removes frames older than 'frame' from database
 void EntityFrame_AckFrame(entity_database_t *d, int frame);
 // (server) clears frame, to prepare for adding entities
-void EntityFrame_Clear(entity_frame_t *f, vec3_t eye);
-// (server) allocates an entity slot in frame, returns NULL if full
-entity_state_t *EntityFrame_NewEntity(entity_frame_t *f, int number);
+void EntityFrame_Clear(entity_frame_t *f, vec3_t eye, int framenum);
+// (server) adds an entity to frame
+void EntityFrame_AddEntity(entity_frame_t *f, entity_state_t *s);
 // (server and client) reads a frame from the database
 void EntityFrame_FetchFrame(entity_database_t *d, int framenum, entity_frame_t *f);
 // (server and client) adds a entity_frame to the database, for future
@@ -499,5 +509,66 @@ void EntityFrame_Read(entity_database_t *d);
 // (client) returns the frame number of the most recent frame recieved
 int EntityFrame_MostRecentlyRecievedFrameNum(entity_database_t *d);
 
+typedef struct entity_database4_commit_s
+{
+       // frame number this commit represents
+       int framenum;
+       // number of entities in entity[] array
+       int numentities;
+       // maximum number of entities in entity[] array (dynamic resizing)
+       int maxentities;
+       entity_state_t *entity;
+}
+entity_database4_commit_t;
+
+typedef struct entity_database4_s
+{
+       // what mempool to use for allocations
+       mempool_t *mempool;
+       // reference frame
+       int referenceframenum;
+       // reference entities array is resized according to demand
+       int maxreferenceentities;
+       // array of states for entities, these are indexable by their entity number (yes there are gaps)
+       entity_state_t *referenceentity;
+       // commits waiting to be applied to the reference database when confirmed
+       // (commit[i]->numentities == 0 means it is empty)
+       entity_database4_commit_t commit[MAX_ENTITY_HISTORY];
+       // (server only) the current commit being worked on
+       entity_database4_commit_t *currentcommit;
+       // (server only) if a commit won't fit entirely, continue where it left
+       // off next frame
+       int currententitynumber;
+       // (client only) most recently received frame number to be sent in next
+       // input update
+       int ackframenum;
+}
+entity_database4_t;
+
+// should-be-private functions that aren't
+int EntityFrame4_SV_ChooseCommitToReplace(entity_database4_t *d);
+entity_state_t *EntityFrame4_GetReferenceEntity(entity_database4_t *d, int number);
+void EntityFrame4_AddCommitEntity(entity_database4_t *d, entity_state_t *s);
+
+// allocate a database
+entity_database4_t *EntityFrame4_AllocDatabase(mempool_t *pool);
+// free a database
+void EntityFrame4_FreeDatabase(entity_database4_t *d);
+// reset a database (resets compression but does not reallocate anything)
+void EntityFrame4_ResetDatabase(entity_database4_t *d);
+// updates database to account for a frame-received acknowledgment
+void EntityFrame4_AckFrame(entity_database4_t *d, int framenum);
+
+// begin writing a frame
+void EntityFrame4_SV_WriteFrame_Begin(entity_database4_t *d, sizebuf_t *msg, int framenum);
+// write an entity in the frame
+// returns false if full
+int EntityFrame4_SV_WriteFrame_Entity(entity_database4_t *d, sizebuf_t *msg, int maxbytes, entity_state_t *s);
+// end writing a frame
+void EntityFrame4_SV_WriteFrame_End(entity_database4_t *d, sizebuf_t *msg);
+
+// reads a frame from the network stream
+void EntityFrame4_CL_ReadFrame(entity_database4_t *d);
+
 #endif