shithub: choc

Info  •  Files  •  Log  •  Branches

strife: Allow inventory items > 255.

The 'inventory' field in ticcmd structures can refer to inventory
values greater than the 8-bit range, so this needs to be transferred
over the network as at least a 16-bit value in order to avoid network
desyncs.

This fixes #454 (thanks Quasar).

--- a/src/net_structrw.c

+++ b/src/net_structrw.c

@@ -192,7 +192,7 @@

     if (diff->diff & NET_TICDIFF_STRIFE)

     {

         NET_WriteInt8(packet, diff->cmd.buttons2);

-        NET_WriteInt8(packet, diff->cmd.inventory);

+        NET_WriteInt16(packet, diff->cmd.inventory);

     }

 }

@@ -277,7 +277,7 @@

             return false;

         diff->cmd.buttons2 = val;

-        if (!NET_ReadInt8(packet, &val))

+        if (!NET_ReadInt16(packet, &val))

             return false;

         diff->cmd.inventory = val;

     }