fix a stupid bug in shader parsing (it was ignoring passes when not transparent)

[xonotic/darkplaces.git] / protocol.h

diff --git a/protocol.h b/protocol.h
index 398cf838f1b02c515dc4d63bd4d0274f3f6ff02b..b749fe6a4e525b7d9659bcc44d6f50d7b469d1ef 100644 (file)
--- a/protocol.h
+++ b/protocol.h
@@ -22,27 +22,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef PROTOCOL_H
 #define PROTOCOL_H
 
-// LordHavoc: I own protocol ranges 96, 97, 3500-3599
+// protocolversion_t is defined in common.h
 
-// quake or darkplaces extended quake entity protocol
-// (still used by TomazQuake and others)
-#define        PROTOCOL_QUAKE 15
-
-// neh_gl entity protocol
-// (failed QSG protocol, used only by nehahra movie)
-#define        PROTOCOL_NEHAHRAMOVIE 250
-
-// entityframe protocol
-#define        PROTOCOL_DARKPLACES1 96
-#define        PROTOCOL_DARKPLACES2 97
-
-// entityframe4 protocol
-#define        PROTOCOL_DARKPLACES3 3500
-#define PROTOCOL_DARKPLACES4 3501
-
-// entityframe5 protocol
-#define PROTOCOL_DARKPLACES5 3502
-#define PROTOCOL_DARKPLACES6 3503
+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);
+void Protocol_Names(char *buffer, size_t buffersize);
 
 // model effects
 #define        EF_ROCKET       1                       // leave a trail
@@ -645,7 +631,7 @@ void EntityFrame4_CL_ReadFrame(void);
 // byte = bound(0, s->scale * 16, 255)
 #define E5_SCALE (1<<10)
 // flag
-#define E5_ORIGIN32 (1<<11) 
+#define E5_ORIGIN32 (1<<11)
 // flag
 #define E5_ANGLES16 (1<<12)
 // flag
@@ -716,25 +702,29 @@ typedef struct entityframe5_database_s
 {
        // number of the latest message sent to client
        int latestframenum;
+       // updated by WriteFrame for internal use
+       int viewentnum;
 
        // logs of all recently sent messages (between acked and latest)
        entityframe5_packetlog_t packetlog[ENTITYFRAME5_MAXPACKETLOGS];
 
+       // this goes up as needed and causes all the arrays to be reallocated
+       int maxedicts;
+
        // which properties of each entity have changed since last send
-       int deltabits[MAX_EDICTS];
+       int *deltabits; // [maxedicts]
        // priorities of entities (updated whenever deltabits change)
        // (derived from deltabits)
-       qbyte priorities[MAX_EDICTS];
+       qbyte *priorities; // [maxedicts]
        // last frame this entity was sent on, for prioritzation
-       int updateframenum[MAX_EDICTS];
+       int *updateframenum; // [maxedicts]
 
        // database of current status of all entities
-       // (FIXME: this is 2.5mb per client even if most is unused!)
-       entity_state_t states[MAX_EDICTS];
+       entity_state_t *states; // [maxedicts]
        // which entities are currently active
        // (duplicate of the active bit of every state in states[])
        // (derived from states)
-       qbyte visiblebits[(MAX_EDICTS+7)/8];
+       qbyte *visiblebits; // [(maxedicts+7)/8]
 
        // delta compression of stats
        qbyte statsdeltabits[(MAX_CL_STATS+7)/8];
@@ -758,13 +748,12 @@ entityframe5_database_t;
 entityframe5_database_t *EntityFrame5_AllocDatabase(mempool_t *pool);
 void EntityFrame5_FreeDatabase(entityframe5_database_t *d);
 void EntityFrame5_ResetDatabase(entityframe5_database_t *d);
-int EntityState5_Priority(entityframe5_database_t *d, entity_state_t *view, entity_state_t *s, int changedbits, int age);
 void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbits, sizebuf_t *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, int viewentnum);
+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);
+void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int numstates, const entity_state_t *states, int viewentnum, int *stats, int movesequence);
 
 extern cvar_t developer_networkentities;