Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 07:17:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit godotengine/godot@5dd76968d8

Browse Source
This commit is contained in:
Spartan322
2025-06-05 19:48:09 -04:00
parent 0f840bc33a 5dd76968d8
commit 0e99b001ac
772 changed files with 22320 additions and 10966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/enet/doc_classes/ENetConnection.xml
View File

@@ -129,7 +129,7 @@
<return type="float" />
<param index="0" name="statistic" type="int" enum="ENetConnection.HostStatistic" />
<description>
Returns and resets host statistics. See [enum HostStatistic] for more info.
Returns and resets host statistics.
</description>
</method>
<method name="refuse_new_connections">

4
modules/enet/doc_classes/ENetPacketPeer.xml
View File

@@ -39,14 +39,14 @@
<method name="get_state" qualifiers="const">
<return type="int" enum="ENetPacketPeer.PeerState" />
<description>
Returns the current peer state. See [enum PeerState].
Returns the current peer state.
</description>
</method>
<method name="get_statistic">
<return type="float" />
<param index="0" name="statistic" type="int" enum="ENetPacketPeer.PeerStatistic" />
<description>
Returns the requested [param statistic] for this peer. See [enum PeerStatistic].
Returns the requested [param statistic] for this peer.
</description>
</method>
<method name="is_active" qualifiers="const">

17
modules/enet/enet_connection.cpp
View File

@@ -424,11 +424,11 @@ size_t ENetConnection::Compressor::enet_compress(void *context, const ENetBuffer
compressor->src_mem.resize(inLimit);
}
int total = inLimit;
int ofs = 0;
size_t total = inLimit;
size_t ofs = 0;
while (total) {
for (size_t i = 0; i < inBufferCount; i++) {
int to_copy = MIN(total, int(inBuffers[i].dataLength));
const size_t to_copy = MIN(total, inBuffers[i].dataLength);
memcpy(&compressor->src_mem.write[ofs], inBuffers[i].data, to_copy);
ofs += to_copy;
total -= to_copy;
@@ -452,28 +452,29 @@ size_t ENetConnection::Compressor::enet_compress(void *context, const ENetBuffer
}
}
int req_size = Compression::get_max_compressed_buffer_size(ofs, mode);
const int64_t req_size = Compression::get_max_compressed_buffer_size(ofs, mode);
if (compressor->dst_mem.size() < req_size) {
compressor->dst_mem.resize(req_size);
}
int ret = Compression::compress(compressor->dst_mem.ptrw(), compressor->src_mem.ptr(), ofs, mode);
const int64_t ret = Compression::compress(compressor->dst_mem.ptrw(), compressor->src_mem.ptr(), ofs, mode);
if (ret < 0) {
return 0;
}
if (ret > int(outLimit)) {
const size_t ret_size = size_t(ret);
if (ret_size > outLimit) {
return 0; // Do not bother
}
memcpy(outData, compressor->dst_mem.ptr(), ret);
memcpy(outData, compressor->dst_mem.ptr(), ret_size);
return ret;
}
size_t ENetConnection::Compressor::enet_decompress(void *context, const enet_uint8 *inData, size_t inLimit, enet_uint8 *outData, size_t outLimit) {
Compressor *compressor = (Compressor *)(context);
int ret = -1;
int64_t ret = -1;
switch (compressor->mode) {
case COMPRESS_FASTLZ: {
ret = Compression::decompress(outData, outLimit, inData, inLimit, Compression::MODE_FASTLZ);