PROTOCOL: PEXT_MODELDBL uint16 indices if needed.

Broken implementation from way back when. If modelindex is beyond
uint8 + MODELDBL, unflag U_MODEL and write uint16 instead.

Author: dsvensson

src/bothdefs.h

@@ -48,10 +48,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 // per-level limits
 //
+#define	MAX_STATIC_ENTITIES     2048    // Could be MAX_MODELS - MAX_EDICTS, but static allocation
 #define	MAX_EDICTS              2048    // can't encode more than this, see SV_WriteDelta
 #define MAX_EDICTS_SAFE         512     // lower limit, to make sure no client limits exceeded
 #define	MAX_LIGHTSTYLES         64
-#define	MAX_MODELS              512     // can't encode more than this, see SV_WriteDelta
+#define	MAX_MODELS              4096    // really just UINT16_MAX, see SV_WriteDelta, PEXT_MODELDBL, dynamic + static entities
 #define	MAX_SOUNDS              256     // so they cannot be blindly increased
 #define MAX_VWEP_MODELS         32      // could be increased to 256
 

src/bspfile.h

@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define	MAX_MAP_HULLS		4
 
-#define	MAX_MAP_MODELS		512
+#define	MAX_MAP_MODELS		4096
 #define	MAX_MAP_BRUSHES		4096
 #define	MAX_MAP_ENTITIES	1024
 #define	MAX_MAP_ENTSTRING	65536

src/server.h

@@ -126,7 +126,7 @@ typedef struct
 
 	qbool		   mvdrecording;
 
-	entity_state_t static_entities[512];
+	entity_state_t static_entities[MAX_STATIC_ENTITIES];
 	int            static_entity_count;
 } server_t;
 

src/sv_demo.c

@@ -1321,8 +1321,9 @@ void SV_MVD_SendInitialGamestate(mvddest_t* dest)
 	while (s)
 	{
 		MSG_WriteString (&buf, s);
-		if (buf.cursize > MAX_MSGLEN/2)
+		if (buf.cursize > MAX_MSGLEN/2 && n & 0xff)
 		{
+			// partial flush as long as not at a zero boundary
 			MSG_WriteByte (&buf, 0);
 			MSG_WriteByte (&buf, n);
 			SV_WriteRecordMVDMessage (&buf);

src/sv_ents.c

@@ -159,6 +159,9 @@ void SV_WriteDelta(client_t* client, entity_state_t *from, entity_state_t *to, s
 		bits |= U_MODEL;
 #ifdef FTE_PEXT_ENTITYDBL
 		if (to->modelindex > 255) {
+			if (to->modelindex >= 512) {
+				bits &= ~U_MODEL;
+			}
 			evenmorebits |= U_FTE_MODELDBL;
 			required_extensions |= FTE_PEXT_MODELDBL;
 		}
@@ -264,6 +267,8 @@ void SV_WriteDelta(client_t* client, entity_state_t *from, entity_state_t *to, s
 
 	if (bits & U_MODEL)
 		MSG_WriteByte(msg, to->modelindex & 255);
+	else if (evenmorebits & U_FTE_MODELDBL)
+		MSG_WriteShort(msg, to->modelindex);
 	if (bits & U_FRAME)
 		MSG_WriteByte(msg, to->frame);
 	if (bits & U_COLORMAP)