oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-15 19:42:10 +00:00
Code Wiki Activity

Merge remote-tracking branch 'upstream/master' into Visuals-Vol-2

Browse source
This commit is contained in:
Gefüllte Taubenbrust 2024-06-11 13:59:14 +02:00
commit cd6e304cfa
172 changed files with 27747 additions and 18949 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/network/connection.cpp
View file

@ -1078,7 +1078,7 @@ bool UDPPeer::processReliableSendCommand(
bool have_sequence_number = false;
bool have_initial_sequence_number = false;
std::queue<BufferedPacketPtr> toadd;
volatile u16 initial_sequence_number = 0;
u16 initial_sequence_number = 0;
for (SharedBuffer<u8> &original : originals) {
u16 seqnum = chan.getOutgoingSequenceNumber(have_sequence_number);
@ -1118,7 +1118,7 @@ bool UDPPeer::processReliableSendCommand(
return true;
}
volatile u16 packets_available = toadd.size();
u16 packets_available = toadd.size();
/* we didn't get a single sequence number no need to fill queue */
if (!have_initial_sequence_number) {
LOG(derr_con << m_connection->getDesc() << "Ran out of sequence numbers!" << std::endl);

2
src/network/connection_internal.h
View file

@ -455,7 +455,7 @@ public:
void PutReliableSendCommand(ConnectionCommandPtr &c,
unsigned int max_packet_size) override;
virtual const Address &getAddress() const {
virtual const Address &getAddress() const override {
return address;
}