Fix rebasing problems.

Perhaps I shouldn't rebase when I'm sleepy.
DescentDevelopers · May 24, 2024 · 53703b3 · 53703b3
1 parent 2ba54a5
commit 53703b3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/AudioEncode/encoder.cpp b/AudioEncode/encoder.cpp
@@ -25,6 +25,7 @@
 #include "Aencode.h"
 
 static int32_t aenc_ReadSamp(void *data) {
+  FILE *f = (FILE *)data;
   int a, b;
   a = getc(f);
   if (a == EOF)

diff --git a/Descent3/multi.h b/Descent3/multi.h
@@ -1222,8 +1222,8 @@ int MultiGetShipChecksum(int ship_index);
 /// Returns a unique value for this ship.
 void MultiProcessShipChecksum(MD5 *md5, int ship_index);
 
-extern int SearchForLocalGamesTCP(unsigned int ask, ushort port);
-extern int SearchForGamesPXO(unsigned int ask, ushort port);
+extern int SearchForLocalGamesTCP(uint32_t ask, uint16_t port);
+extern int SearchForGamesPXO(uint32_t ask, uint16_t port);
 extern void UpdateAndPackGameList(void);
 /// Checks if the selected mission and script are compatible
 /// - Returns: -1: Not compatible!  >=0: Number of teams supported for this mod & level

diff --git a/lib/networking.h b/lib/networking.h
@@ -422,7 +422,7 @@ int nw_SendPilotTrackerPacket(void *packet);
 int nw_ReceivePilotTracker(void *packet);
 
 // buffer a packet (maintain order!)
-void nw_psnet_buffer_packet(ubyte *data, int length, network_address *from);
+void nw_psnet_buffer_packet(uint8_t *data, int length, network_address *from);
 
 // This is all the reliable UDP stuff...
 #define MAXNETBUFFERS                                                                                                  \

diff --git a/networking/networking.cpp b/networking/networking.cpp
@@ -527,12 +527,15 @@ static int nw_PingCompare(const void *arg1, const void *arg2);
 static void nw_ReliableResend(void);
 
 /// Get the index of the next packet in order!
-static int nw_psnet_buffer_get_next(ubyte *data, int *length, network_address *from);
+static int nw_psnet_buffer_get_next(uint8_t *data, int *length, network_address *from);
 
 /// Get the index of the next packet in order!
-static int nw_psnet_buffer_get_next_by_dpid(ubyte *data, int *length, unsigned long dpid);
+static int nw_psnet_buffer_get_next_by_dpid(uint8_t *data, int *length, unsigned long dpid);
 
-static void nw_HandleUnreliableData(ubyte *data, int len, network_address *from_addr);
+/// Get the index of the next packet in order!
+static int nw_psnet_buffer_get_next_by_packet_id(uint8_t *data, int *length, uint32_t packet_id);
+
+static void nw_HandleUnreliableData(uint8_t *data, int len, network_address *from_addr);
 
 /// Called by \c psnet_init to initialize the listen socket used by a host/server.
 static int nw_InitReliableSocket();
@@ -542,7 +545,7 @@ static void nw_SendReliableAck(SOCKADDR *raddr, unsigned int sig, network_protoc
 /// Initialize the buffering system.
 static void nw_psnet_buffer_init();
 
-static void nw_HandleConnectResponse(ubyte *data, int len, network_address *server_addr);
+static void nw_HandleConnectResponse(uint8_t *data, int len, network_address *server_addr);
 
 void CloseNetworking() {
   if (Sockets_initted != 1)