Sara/going
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: updated engine version to 4.4-rc1

Browse source
This commit is contained in:
Sara 2025-02-23 14:38:14 +01:00
parent ee00efde1f
commit 21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engine/thirdparty/enet/enet/enet.h vendored
View file

@ -13,7 +13,6 @@ extern "C"
#include <stdint.h>
#include <stdlib.h>
// -- Godot start --
#if 0
#ifdef _WIN32
#include "enet/win32.h"
@ -21,8 +20,7 @@ extern "C"
#include "enet/unix.h"
#endif
#endif
#include "enet/godot.h"
// -- Godot end --
#include "enet/enet_godot.h"
#include "enet/types.h"
#include "enet/protocol.h"
@ -93,7 +91,6 @@ typedef enum _ENetSocketShutdown
* but not for enet_host_create. Once a server responds to a broadcast, the
* address is updated from ENET_HOST_BROADCAST to the server's actual IP address.
*/
// -- Godot start --
#if 0
typedef struct _ENetAddress
{
@ -101,7 +98,6 @@ typedef struct _ENetAddress
enet_uint16 port;
} ENetAddress;
#endif
// -- Godot end --
/**
* Packet flag bit constants.
@ -618,9 +614,7 @@ ENET_API size_t enet_range_coder_decompress (void *, const enet_uint8 *, size_t,
extern size_t enet_protocol_command_size (enet_uint8);
// -- Godot start --
#include "enet/godot_ext.h"
// -- Godot end --
#include "enet/enet_godot_ext.h"
#ifdef __cplusplus
}

4
engine/thirdparty/enet/enet/godot.h → engine/thirdparty/enet/enet/enet_godot.h vendored
View file

@ -1,5 +1,5 @@
/**************************************************************************/
/* godot.h */
/* enet_godot.h */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -29,7 +29,7 @@
/**************************************************************************/
/**
@file godot.h
@file enet_godot.h
@brief ENet Godot header
*/

53
engine/thirdparty/enet/enet/enet_godot_ext.h vendored Normal file
View file

@ -0,0 +1,53 @@
/**************************************************************************/
/* enet_godot_ext.h */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
/**
@ *file enet_godot_ext.h
@brief ENet Godot extensions header
*/
#ifndef __ENET_GODOT_EXT_H__
#define __ENET_GODOT_EXT_H__
/** Sets the host field in the address parameter from ip struct.
@param address destination to store resolved address
@param ip the ip struct to read from
@param size the size of the ip struct.
@retval 0 on success
@retval != 0 on failure
@returns the address of the given ip in address on success.
*/
ENET_API void enet_address_set_ip(ENetAddress * address, const uint8_t * ip, size_t size);
ENET_API int enet_host_dtls_server_setup (ENetHost *, void *);
ENET_API int enet_host_dtls_client_setup (ENetHost *, const char *, void *);
ENET_API void enet_host_refuse_new_connections (ENetHost *, int);
#endif // __ENET_GODOT_EXT_H__

18
engine/thirdparty/enet/enet/godot_ext.h vendored
View file

@ -1,18 +0,0 @@
#ifndef __ENET_GODOT_EXT_H__
#define __ENET_GODOT_EXT_H__
/** Sets the host field in the address parameter from ip struct.
@param address destination to store resolved address
@param ip the ip struct to read from
@param size the size of the ip struct.
@retval 0 on success
@retval != 0 on failure
@returns the address of the given ip in address on success.
*/
ENET_API void enet_address_set_ip(ENetAddress * address, const uint8_t * ip, size_t size);
ENET_API int enet_host_dtls_server_setup (ENetHost *, void *);
ENET_API int enet_host_dtls_client_setup (ENetHost *, const char *, void *);
ENET_API void enet_host_refuse_new_connections (ENetHost *, int);
#endif // __ENET_GODOT_EXT_H__

4
engine/thirdparty/enet/godot.cpp → engine/thirdparty/enet/enet_godot.cpp vendored
View file

@ -1,5 +1,5 @@
/**************************************************************************/
/* godot.cpp */
/* enet_godot.cpp */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -29,7 +29,7 @@
/**************************************************************************/
/**
@file godot.cpp
@file enet_godot.cpp
@brief ENet Godot specific functions
*/

18
engine/thirdparty/enet/patches/godot_socket.patch → engine/thirdparty/enet/patches/0001-godot-socket.patch vendored
View file

@ -1,15 +1,14 @@
diff --git a/thirdparty/enet/enet/enet.h b/thirdparty/enet/enet/enet.h
index 4a207041b3..5232f8a869 100644
index 3001018763..ccd8382c23 100644
--- a/thirdparty/enet/enet/enet.h
+++ b/thirdparty/enet/enet/enet.h
@@ -10,13 +10,19 @@ extern "C"
@@ -10,13 +10,17 @@ extern "C"
{
#endif
+#include <stdint.h>
#include <stdlib.h>
+// -- Godot start --
+#if 0
#ifdef _WIN32
#include "enet/win32.h"
@ -17,16 +16,14 @@ index 4a207041b3..5232f8a869 100644
#include "enet/unix.h"
#endif
+#endif
+#include "enet/godot.h"
+// -- Godot end --
+#include "enet/enet_godot.h"
#include "enet/types.h"
#include "enet/protocol.h"
@@ -87,11 +93,15 @@ typedef enum _ENetSocketShutdown
@@ -87,11 +91,13 @@ typedef enum _ENetSocketShutdown
* but not for enet_host_create. Once a server responds to a broadcast, the
* address is updated from ENET_HOST_BROADCAST to the server's actual IP address.
*/
+// -- Godot start --
+#if 0
typedef struct _ENetAddress
{
@ -34,17 +31,14 @@ index 4a207041b3..5232f8a869 100644
enet_uint16 port;
} ENetAddress;
+#endif
+// -- Godot end --
/**
* Packet flag bit constants.
@@ -608,6 +618,10 @@ ENET_API size_t enet_range_coder_decompress (void *, const enet_uint8 *, size_t,
@@ -608,6 +614,8 @@ ENET_API size_t enet_range_coder_decompress (void *, const enet_uint8 *, size_t,
extern size_t enet_protocol_command_size (enet_uint8);
+// -- Godot start --
+#include "enet/godot_ext.h"
+// -- Godot end --
+#include "enet/enet_godot_ext.h"
+
#ifdef __cplusplus
}