diff options
Diffstat (limited to 'core')
235 files changed, 386 insertions, 39 deletions
diff --git a/core/allocators.h b/core/allocators.h index 0d5989b4ab..e17ab298d6 100644 --- a/core/allocators.h +++ b/core/allocators.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ALLOCATORS_H #define ALLOCATORS_H diff --git a/core/array.cpp b/core/array.cpp index a333830d3a..c53fea1f28 100644 --- a/core/array.cpp +++ b/core/array.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "array.h" #include "hashfuncs.h" diff --git a/core/array.h b/core/array.h index 4aef4f49c5..7c6fc59048 100644 --- a/core/array.h +++ b/core/array.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ARRAY_H #define ARRAY_H diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index c1e33c1493..2921626f3a 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "core_bind.h" #include "core/project_settings.h" @@ -70,7 +71,13 @@ Ref<ResourceInteractiveLoader> _ResourceLoader::load_interactive(const String &p RES _ResourceLoader::load(const String &p_path, const String &p_type_hint, bool p_no_cache) { - RES ret = ResourceLoader::load(p_path, p_type_hint, p_no_cache); + Error err = OK; + RES ret = ResourceLoader::load(p_path, p_type_hint, p_no_cache, &err); + + if (err != OK) { + ERR_EXPLAIN("Error loading resource: '" + p_path + "'"); + ERR_FAIL_COND_V(err != OK, ret); + } return ret; } diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index ed4111fea4..bc5b8ea04c 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CORE_BIND_H #define CORE_BIND_H diff --git a/core/class_db.cpp b/core/class_db.cpp index 141bc1c5e2..d2cd362792 100644 --- a/core/class_db.cpp +++ b/core/class_db.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "class_db.h" #include "os/mutex.h" diff --git a/core/class_db.h b/core/class_db.h index c977068be1..14e36e459b 100644 --- a/core/class_db.h +++ b/core/class_db.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CLASS_DB_H #define CLASS_DB_H diff --git a/core/color.cpp b/core/color.cpp index 00a31dfdd8..7278b5c4ee 100644 --- a/core/color.cpp +++ b/core/color.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "color.h" #include "color_names.inc" diff --git a/core/color.h b/core/color.h index 70b0e1fea2..0ff4fe6edd 100644 --- a/core/color.h +++ b/core/color.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLOR_H #define COLOR_H diff --git a/core/command_queue_mt.cpp b/core/command_queue_mt.cpp index 8ce0ba7810..6bb3135757 100644 --- a/core/command_queue_mt.cpp +++ b/core/command_queue_mt.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "command_queue_mt.h" #include "os/os.h" diff --git a/core/command_queue_mt.h b/core/command_queue_mt.h index e53ded6755..cecc9e405d 100644 --- a/core/command_queue_mt.h +++ b/core/command_queue_mt.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COMMAND_QUEUE_MT_H #define COMMAND_QUEUE_MT_H diff --git a/core/compressed_translation.cpp b/core/compressed_translation.cpp index b393b67d50..266d793af7 100644 --- a/core/compressed_translation.cpp +++ b/core/compressed_translation.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "compressed_translation.h" #include "pair.h" diff --git a/core/compressed_translation.h b/core/compressed_translation.h index bedd38d1bc..400fa4491b 100644 --- a/core/compressed_translation.h +++ b/core/compressed_translation.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COMPRESSED_TRANSLATION_H #define COMPRESSED_TRANSLATION_H diff --git a/core/core_string_names.cpp b/core/core_string_names.cpp index 7a9edcad46..ba596f7f16 100644 --- a/core/core_string_names.cpp +++ b/core/core_string_names.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "core_string_names.h" CoreStringNames *CoreStringNames::singleton = NULL; diff --git a/core/core_string_names.h b/core/core_string_names.h index f48692f470..dcbce14aac 100644 --- a/core/core_string_names.h +++ b/core/core_string_names.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CORE_STRING_NAMES_H #define CORE_STRING_NAMES_H diff --git a/core/dictionary.cpp b/core/dictionary.cpp index 72893c41f6..ae1af86b77 100644 --- a/core/dictionary.cpp +++ b/core/dictionary.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "dictionary.h" #include "ordered_hash_map.h" diff --git a/core/dictionary.h b/core/dictionary.h index 86f676fc38..f001f2d5e1 100644 --- a/core/dictionary.h +++ b/core/dictionary.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DICTIONARY_H #define DICTIONARY_H diff --git a/core/dvector.cpp b/core/dvector.cpp index 653c04b498..b679df55ad 100644 --- a/core/dvector.cpp +++ b/core/dvector.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "dvector.h" Mutex *dvector_lock = NULL; diff --git a/core/dvector.h b/core/dvector.h index 492a4e0ed9..c0190fb9e3 100644 --- a/core/dvector.h +++ b/core/dvector.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DVECTOR_H #define DVECTOR_H diff --git a/core/engine.cpp b/core/engine.cpp index 4cadad1f6e..af9052110f 100644 --- a/core/engine.cpp +++ b/core/engine.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "engine.h" #include "version.h" diff --git a/core/engine.h b/core/engine.h index 2741d09b52..54b30ab81f 100644 --- a/core/engine.h +++ b/core/engine.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ENGINE_H #define ENGINE_H diff --git a/core/error_list.h b/core/error_list.h index 47233e39fe..6b9cd0016b 100644 --- a/core/error_list.h +++ b/core/error_list.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ERROR_LIST_H #define ERROR_LIST_H diff --git a/core/error_macros.cpp b/core/error_macros.cpp index 76be0756b8..5786802930 100644 --- a/core/error_macros.cpp +++ b/core/error_macros.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "error_macros.h" #include "io/logger.h" diff --git a/core/error_macros.h b/core/error_macros.h index 2bfa94b99e..1f9164a99b 100644 --- a/core/error_macros.h +++ b/core/error_macros.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ERROR_MACROS_H #define ERROR_MACROS_H diff --git a/core/func_ref.cpp b/core/func_ref.cpp index 98053808b4..c707f1c4cb 100644 --- a/core/func_ref.cpp +++ b/core/func_ref.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "func_ref.h" Variant FuncRef::call_func(const Variant **p_args, int p_argcount, Variant::CallError &r_error) { diff --git a/core/func_ref.h b/core/func_ref.h index 9f2df8cb5d..681fe747d6 100644 --- a/core/func_ref.h +++ b/core/func_ref.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FUNC_REF_H #define FUNC_REF_H diff --git a/core/global_constants.cpp b/core/global_constants.cpp index abe829420a..a24bf03c9a 100644 --- a/core/global_constants.cpp +++ b/core/global_constants.cpp @@ -10,7 +10,7 @@ /* */ /* 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 */ +/* "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 */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "global_constants.h" #include "object.h" diff --git a/core/global_constants.h b/core/global_constants.h index 09f93e34a2..76f618989c 100644 --- a/core/global_constants.h +++ b/core/global_constants.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GLOBAL_CONSTANTS_H #define GLOBAL_CONSTANTS_H diff --git a/core/hash_map.h b/core/hash_map.h index 1a4f879fea..2df743ba7d 100644 --- a/core/hash_map.h +++ b/core/hash_map.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef HASH_MAP_H #define HASH_MAP_H diff --git a/core/hashfuncs.h b/core/hashfuncs.h index 0725a7ebf6..ae99fa39c8 100644 --- a/core/hashfuncs.h +++ b/core/hashfuncs.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef HASHFUNCS_H #define HASHFUNCS_H diff --git a/core/helper/math_fieldwise.h b/core/helper/math_fieldwise.h index c883c44f84..0e7cc3ea4a 100644 --- a/core/helper/math_fieldwise.h +++ b/core/helper/math_fieldwise.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MATH_FIELDWISE_H #define MATH_FIELDWISE_H diff --git a/core/helper/value_evaluator.h b/core/helper/value_evaluator.h index 954d229517..39177a7820 100644 --- a/core/helper/value_evaluator.h +++ b/core/helper/value_evaluator.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VALUE_EVALUATOR_H #define VALUE_EVALUATOR_H diff --git a/core/image.cpp b/core/image.cpp index 11429b8782..41d70e6df6 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "image.h" #include "core/io/image_loader.h" @@ -446,8 +447,6 @@ void Image::convert(Format p_new_format) { Image new_img(width, height, 0, p_new_format); - //int len=data.size(); - PoolVector<uint8_t>::Read r = data.read(); PoolVector<uint8_t>::Write w = new_img.data.write(); @@ -695,6 +694,11 @@ void Image::resize_to_po2(bool p_square) { void Image::resize(int p_width, int p_height, Interpolation p_interpolation) { + if (data.size() == 0) { + ERR_EXPLAIN("Cannot resize image before creating it, use create() or create_from_data() first."); + ERR_FAIL(); + } + if (!_can_modify(format)) { ERR_EXPLAIN("Cannot resize in indexed, compressed or custom image formats."); ERR_FAIL(); diff --git a/core/image.h b/core/image.h index 767f3c6ac5..e962787ae9 100644 --- a/core/image.h +++ b/core/image.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IMAGE_H #define IMAGE_H diff --git a/core/input_map.cpp b/core/input_map.cpp index 7833aab3f3..a9ea1d9545 100644 --- a/core/input_map.cpp +++ b/core/input_map.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "input_map.h" #include "os/keyboard.h" diff --git a/core/input_map.h b/core/input_map.h index 12ac1b339b..84d90f6f2a 100644 --- a/core/input_map.h +++ b/core/input_map.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef INPUT_MAP_H #define INPUT_MAP_H diff --git a/core/io/compression.cpp b/core/io/compression.cpp index a4dbebe9f7..bc3bfcf356 100644 --- a/core/io/compression.cpp +++ b/core/io/compression.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "compression.h" #include "os/copymem.h" #include "project_settings.h" diff --git a/core/io/compression.h b/core/io/compression.h index 034c5ab708..a0ccd539cb 100644 --- a/core/io/compression.h +++ b/core/io/compression.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COMPRESSION_H #define COMPRESSION_H diff --git a/core/io/config_file.cpp b/core/io/config_file.cpp index 9a013cb775..aa06ae5cc0 100644 --- a/core/io/config_file.cpp +++ b/core/io/config_file.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "config_file.h" #include "os/file_access.h" #include "os/keyboard.h" diff --git a/core/io/config_file.h b/core/io/config_file.h index 2168e654dd..ac749bed76 100644 --- a/core/io/config_file.h +++ b/core/io/config_file.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONFIG_FILE_H #define CONFIG_FILE_H diff --git a/core/io/file_access_buffered.cpp b/core/io/file_access_buffered.cpp index 442ab2c6e4..dcaf99e24a 100644 --- a/core/io/file_access_buffered.cpp +++ b/core/io/file_access_buffered.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access_buffered.h" #include <string.h> diff --git a/core/io/file_access_buffered.h b/core/io/file_access_buffered.h index 2d6df5d48a..f4ed47d6bc 100644 --- a/core/io/file_access_buffered.h +++ b/core/io/file_access_buffered.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_BUFFERED_H #define FILE_ACCESS_BUFFERED_H diff --git a/core/io/file_access_buffered_fa.h b/core/io/file_access_buffered_fa.h index bb3d3f33f6..493fa1c243 100644 --- a/core/io/file_access_buffered_fa.h +++ b/core/io/file_access_buffered_fa.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_BUFFERED_FA_H #define FILE_ACCESS_BUFFERED_FA_H diff --git a/core/io/file_access_compressed.cpp b/core/io/file_access_compressed.cpp index aabd70cc7b..d6547ba19f 100644 --- a/core/io/file_access_compressed.cpp +++ b/core/io/file_access_compressed.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access_compressed.h" #include "print_string.h" void FileAccessCompressed::configure(const String &p_magic, Compression::Mode p_mode, int p_block_size) { diff --git a/core/io/file_access_compressed.h b/core/io/file_access_compressed.h index 65eefbcd97..587f58a7c6 100644 --- a/core/io/file_access_compressed.h +++ b/core/io/file_access_compressed.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_COMPRESSED_H #define FILE_ACCESS_COMPRESSED_H diff --git a/core/io/file_access_encrypted.cpp b/core/io/file_access_encrypted.cpp index 67151f6934..221f457b78 100644 --- a/core/io/file_access_encrypted.cpp +++ b/core/io/file_access_encrypted.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access_encrypted.h" #include "core/variant.h" diff --git a/core/io/file_access_encrypted.h b/core/io/file_access_encrypted.h index 002a124e86..b9365a9fd0 100644 --- a/core/io/file_access_encrypted.h +++ b/core/io/file_access_encrypted.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_ENCRYPTED_H #define FILE_ACCESS_ENCRYPTED_H diff --git a/core/io/file_access_memory.cpp b/core/io/file_access_memory.cpp index 8812aa847e..1aa1e4a595 100644 --- a/core/io/file_access_memory.cpp +++ b/core/io/file_access_memory.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access_memory.h" #include "map.h" diff --git a/core/io/file_access_memory.h b/core/io/file_access_memory.h index 1d438409cc..2136f4cc0c 100644 --- a/core/io/file_access_memory.h +++ b/core/io/file_access_memory.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_MEMORY_H #define FILE_ACCESS_MEMORY_H diff --git a/core/io/file_access_network.cpp b/core/io/file_access_network.cpp index 1aa431dcae..7b2bccdfec 100644 --- a/core/io/file_access_network.cpp +++ b/core/io/file_access_network.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access_network.h" #include "io/ip.h" #include "marshalls.h" diff --git a/core/io/file_access_network.h b/core/io/file_access_network.h index 4d8e8f1a9a..be9bdb1af6 100644 --- a/core/io/file_access_network.h +++ b/core/io/file_access_network.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_NETWORK_H #define FILE_ACCESS_NETWORK_H diff --git a/core/io/file_access_pack.cpp b/core/io/file_access_pack.cpp index 318e3ad759..1a16d0f61c 100644 --- a/core/io/file_access_pack.cpp +++ b/core/io/file_access_pack.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access_pack.h" #include "version.h" diff --git a/core/io/file_access_pack.h b/core/io/file_access_pack.h index 6c5fec1498..8a40e6d78c 100644 --- a/core/io/file_access_pack.h +++ b/core/io/file_access_pack.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_PACK_H #define FILE_ACCESS_PACK_H diff --git a/core/io/file_access_zip.cpp b/core/io/file_access_zip.cpp index c439ac7fa5..7b6385c3ff 100644 --- a/core/io/file_access_zip.cpp +++ b/core/io/file_access_zip.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef MINIZIP_ENABLED #include "file_access_zip.h" diff --git a/core/io/file_access_zip.h b/core/io/file_access_zip.h index b8f4a93e2a..df83575f6a 100644 --- a/core/io/file_access_zip.h +++ b/core/io/file_access_zip.h @@ -27,10 +27,11 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef MINIZIP_ENABLED -#ifndef FILE_ACCESS_Zip_H -#define FILE_ACCESS_Zip_H +#ifndef FILE_ACCESS_ZIP_H +#define FILE_ACCESS_ZIP_H #include "core/io/file_access_pack.h" #include "map.h" @@ -120,4 +121,4 @@ public: #endif // FILE_ACCESS_ZIP_H -#endif +#endif // MINIZIP_ENABLED diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp index 088c05dfae..54743d37af 100644 --- a/core/io/http_client.cpp +++ b/core/io/http_client.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "http_client.h" #include "io/stream_peer_ssl.h" diff --git a/core/io/http_client.h b/core/io/http_client.h index 0fcaf26fdb..839012e701 100644 --- a/core/io/http_client.h +++ b/core/io/http_client.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef HTTP_CLIENT_H #define HTTP_CLIENT_H diff --git a/core/io/image_loader.cpp b/core/io/image_loader.cpp index c4cdb86c85..999c9a8ca2 100644 --- a/core/io/image_loader.cpp +++ b/core/io/image_loader.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "image_loader.h" #include "print_string.h" diff --git a/core/io/image_loader.h b/core/io/image_loader.h index b147566aed..052a8b8a40 100644 --- a/core/io/image_loader.h +++ b/core/io/image_loader.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IMAGE_LOADER_H #define IMAGE_LOADER_H diff --git a/core/io/ip.cpp b/core/io/ip.cpp index 9d55c5258f..66bd96df4f 100644 --- a/core/io/ip.cpp +++ b/core/io/ip.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "ip.h" #include "hash_map.h" #include "os/semaphore.h" diff --git a/core/io/ip.h b/core/io/ip.h index 69a9b7fd67..d55b05b6fe 100644 --- a/core/io/ip.h +++ b/core/io/ip.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IP_H #define IP_H diff --git a/core/io/ip_address.cpp b/core/io/ip_address.cpp index 6495e0503d..7261363ad6 100644 --- a/core/io/ip_address.cpp +++ b/core/io/ip_address.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "ip_address.h" /* IP_Address::operator Variant() const { diff --git a/core/io/ip_address.h b/core/io/ip_address.h index 7a1c1a17e6..d7b031b960 100644 --- a/core/io/ip_address.h +++ b/core/io/ip_address.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IP_ADDRESS_H #define IP_ADDRESS_H diff --git a/core/io/json.cpp b/core/io/json.cpp index 1cc44f8558..7b2c5a62df 100644 --- a/core/io/json.cpp +++ b/core/io/json.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "json.h" #include "print_string.h" diff --git a/core/io/json.h b/core/io/json.h index f47e0c42c4..9c12423798 100644 --- a/core/io/json.h +++ b/core/io/json.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef JSON_H #define JSON_H diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index 3bdd4454e1..35b9a8610c 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "marshalls.h" #include "os/keyboard.h" #include "print_string.h" diff --git a/core/io/marshalls.h b/core/io/marshalls.h index b7ce1d39e2..381e4e3d20 100644 --- a/core/io/marshalls.h +++ b/core/io/marshalls.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MARSHALLS_H #define MARSHALLS_H diff --git a/core/io/networked_multiplayer_peer.cpp b/core/io/networked_multiplayer_peer.cpp index 95a2048b09..dbfb6d9a81 100644 --- a/core/io/networked_multiplayer_peer.cpp +++ b/core/io/networked_multiplayer_peer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "networked_multiplayer_peer.h" void NetworkedMultiplayerPeer::_bind_methods() { diff --git a/core/io/networked_multiplayer_peer.h b/core/io/networked_multiplayer_peer.h index 3094aa8b99..057b933dc9 100644 --- a/core/io/networked_multiplayer_peer.h +++ b/core/io/networked_multiplayer_peer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NETWORKED_MULTIPLAYER_PEER_H #define NETWORKED_MULTIPLAYER_PEER_H diff --git a/core/io/packet_peer.cpp b/core/io/packet_peer.cpp index 472f6296d2..9cfa04346c 100644 --- a/core/io/packet_peer.cpp +++ b/core/io/packet_peer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "packet_peer.h" #include "io/marshalls.h" diff --git a/core/io/packet_peer.h b/core/io/packet_peer.h index 3e9373a18d..6636d56959 100644 --- a/core/io/packet_peer.h +++ b/core/io/packet_peer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PACKET_PEER_H #define PACKET_PEER_H diff --git a/core/io/packet_peer_udp.cpp b/core/io/packet_peer_udp.cpp index 708c7d456c..bfbea15582 100644 --- a/core/io/packet_peer_udp.cpp +++ b/core/io/packet_peer_udp.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "packet_peer_udp.h" #include "io/ip.h" diff --git a/core/io/packet_peer_udp.h b/core/io/packet_peer_udp.h index d0a1bcf195..035f4ad1c9 100644 --- a/core/io/packet_peer_udp.h +++ b/core/io/packet_peer_udp.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PACKET_PEER_UDP_H #define PACKET_PEER_UDP_H diff --git a/core/io/pck_packer.cpp b/core/io/pck_packer.cpp index 13a36813ca..596060221e 100644 --- a/core/io/pck_packer.cpp +++ b/core/io/pck_packer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "pck_packer.h" #include "core/os/file_access.h" diff --git a/core/io/pck_packer.h b/core/io/pck_packer.h index e725155ed2..4fcf9a8822 100644 --- a/core/io/pck_packer.h +++ b/core/io/pck_packer.h @@ -27,6 +27,10 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + +#ifndef PCK_PACKER_H +#define PCK_PACKER_H + #include "core/reference.h" class FileAccess; @@ -57,3 +61,5 @@ public: PCKPacker(); ~PCKPacker(); }; + +#endif // PCK_PACKER_H diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp index d652720ad0..15c4835dc6 100644 --- a/core/io/resource_format_binary.cpp +++ b/core/io/resource_format_binary.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_format_binary.h" #include "core/image.h" diff --git a/core/io/resource_format_binary.h b/core/io/resource_format_binary.h index 0329d02981..021f7f6a2f 100644 --- a/core/io/resource_format_binary.h +++ b/core/io/resource_format_binary.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCE_FORMAT_BINARY_H #define RESOURCE_FORMAT_BINARY_H diff --git a/core/io/resource_import.cpp b/core/io/resource_import.cpp index 8d21f41eab..cfe6655504 100644 --- a/core/io/resource_import.cpp +++ b/core/io/resource_import.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_import.h" #include "os/os.h" @@ -137,9 +138,9 @@ void ResourceFormatImporter::get_recognized_extensions(List<String> *p_extension Set<String> found; - for (Set<Ref<ResourceImporter> >::Element *E = importers.front(); E; E = E->next()) { + for (int i = 0; i < importers.size(); i++) { List<String> local_exts; - E->get()->get_recognized_extensions(&local_exts); + importers[i]->get_recognized_extensions(&local_exts); for (List<String>::Element *F = local_exts.front(); F; F = F->next()) { if (!found.has(F->get())) { p_extensions->push_back(F->get()); @@ -157,8 +158,8 @@ void ResourceFormatImporter::get_recognized_extensions_for_type(const String &p_ Set<String> found; - for (Set<Ref<ResourceImporter> >::Element *E = importers.front(); E; E = E->next()) { - String res_type = E->get()->get_resource_type(); + for (int i = 0; i < importers.size(); i++) { + String res_type = importers[i]->get_resource_type(); if (res_type == String()) continue; @@ -166,7 +167,7 @@ void ResourceFormatImporter::get_recognized_extensions_for_type(const String &p_ continue; List<String> local_exts; - E->get()->get_recognized_extensions(&local_exts); + importers[i]->get_recognized_extensions(&local_exts); for (List<String>::Element *F = local_exts.front(); F; F = F->next()) { if (!found.has(F->get())) { p_extensions->push_back(F->get()); @@ -211,9 +212,9 @@ int ResourceFormatImporter::get_import_order(const String &p_path) const { bool ResourceFormatImporter::handles_type(const String &p_type) const { - for (Set<Ref<ResourceImporter> >::Element *E = importers.front(); E; E = E->next()) { + for (int i = 0; i < importers.size(); i++) { - String res_type = E->get()->get_resource_type(); + String res_type = importers[i]->get_resource_type(); if (res_type == String()) continue; if (ClassDB::is_parent_class(res_type, p_type)) @@ -318,9 +319,9 @@ void ResourceFormatImporter::get_dependencies(const String &p_path, List<String> Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_name(const String &p_name) const { - for (Set<Ref<ResourceImporter> >::Element *E = importers.front(); E; E = E->next()) { - if (E->get()->get_importer_name() == p_name) { - return E->get(); + for (int i = 0; i < importers.size(); i++) { + if (importers[i]->get_importer_name() == p_name) { + return importers[i]; } } @@ -329,12 +330,12 @@ Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_name(const String void ResourceFormatImporter::get_importers_for_extension(const String &p_extension, List<Ref<ResourceImporter> > *r_importers) { - for (Set<Ref<ResourceImporter> >::Element *E = importers.front(); E; E = E->next()) { + for (int i = 0; i < importers.size(); i++) { List<String> local_exts; - E->get()->get_recognized_extensions(&local_exts); + importers[i]->get_recognized_extensions(&local_exts); for (List<String>::Element *F = local_exts.front(); F; F = F->next()) { if (p_extension.to_lower() == F->get()) { - r_importers->push_back(E->get()); + r_importers->push_back(importers[i]); } } } @@ -345,14 +346,14 @@ Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_extension(const St Ref<ResourceImporter> importer; float priority = 0; - for (Set<Ref<ResourceImporter> >::Element *E = importers.front(); E; E = E->next()) { + for (int i = 0; i < importers.size(); i++) { List<String> local_exts; - E->get()->get_recognized_extensions(&local_exts); + importers[i]->get_recognized_extensions(&local_exts); for (List<String>::Element *F = local_exts.front(); F; F = F->next()) { - if (p_extension.to_lower() == F->get() && E->get()->get_priority() > priority) { - importer = E->get(); - priority = E->get()->get_priority(); + if (p_extension.to_lower() == F->get() && importers[i]->get_priority() > priority) { + importer = importers[i]; + priority = importers[i]->get_priority(); } } } diff --git a/core/io/resource_import.h b/core/io/resource_import.h index 3583584092..80e0743eda 100644 --- a/core/io/resource_import.h +++ b/core/io/resource_import.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCE_IMPORT_H #define RESOURCE_IMPORT_H @@ -45,7 +46,7 @@ class ResourceFormatImporter : public ResourceFormatLoader { static ResourceFormatImporter *singleton; - Set<Ref<ResourceImporter> > importers; + Vector<Ref<ResourceImporter> > importers; public: static ResourceFormatImporter *get_singleton() { return singleton; } @@ -64,7 +65,7 @@ public: String get_internal_resource_path(const String &p_path) const; void get_internal_resource_path_list(const String &p_path, List<String> *r_paths); - void add_importer(const Ref<ResourceImporter> &p_importer) { importers.insert(p_importer); } + void add_importer(const Ref<ResourceImporter> &p_importer) { importers.push_back(p_importer); } void remove_importer(const Ref<ResourceImporter> &p_importer) { importers.erase(p_importer); } Ref<ResourceImporter> get_importer_by_name(const String &p_name) const; Ref<ResourceImporter> get_importer_by_extension(const String &p_extension) const; diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index 527e6997e1..87add585eb 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_loader.h" #include "io/resource_import.h" #include "os/file_access.h" diff --git a/core/io/resource_loader.h b/core/io/resource_loader.h index fad768778b..9be82abb42 100644 --- a/core/io/resource_loader.h +++ b/core/io/resource_loader.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCE_LOADER_H #define RESOURCE_LOADER_H diff --git a/core/io/resource_saver.cpp b/core/io/resource_saver.cpp index 8a0ccd90ce..609dd7e93c 100644 --- a/core/io/resource_saver.cpp +++ b/core/io/resource_saver.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_saver.h" #include "os/file_access.h" #include "project_settings.h" diff --git a/core/io/resource_saver.h b/core/io/resource_saver.h index fd4d563e4a..396f37d414 100644 --- a/core/io/resource_saver.h +++ b/core/io/resource_saver.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCE_SAVER_H #define RESOURCE_SAVER_H diff --git a/core/io/stream_peer.cpp b/core/io/stream_peer.cpp index b0fd229ac0..f142abd3a4 100644 --- a/core/io/stream_peer.cpp +++ b/core/io/stream_peer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "stream_peer.h" #include "io/marshalls.h" diff --git a/core/io/stream_peer.h b/core/io/stream_peer.h index 212bff0e3e..ff9ae788ec 100644 --- a/core/io/stream_peer.h +++ b/core/io/stream_peer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STREAM_PEER_H #define STREAM_PEER_H diff --git a/core/io/stream_peer_ssl.cpp b/core/io/stream_peer_ssl.cpp index f92b57a044..633b353102 100644 --- a/core/io/stream_peer_ssl.cpp +++ b/core/io/stream_peer_ssl.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "stream_peer_ssl.h" StreamPeerSSL *(*StreamPeerSSL::_create)() = NULL; diff --git a/core/io/stream_peer_ssl.h b/core/io/stream_peer_ssl.h index bb4d2edced..e4d14ebdfd 100644 --- a/core/io/stream_peer_ssl.h +++ b/core/io/stream_peer_ssl.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STREAM_PEER_SSL_H #define STREAM_PEER_SSL_H diff --git a/core/io/stream_peer_tcp.cpp b/core/io/stream_peer_tcp.cpp index 0524a35908..9cfa810034 100644 --- a/core/io/stream_peer_tcp.cpp +++ b/core/io/stream_peer_tcp.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "stream_peer_tcp.h" StreamPeerTCP *(*StreamPeerTCP::_create)() = NULL; diff --git a/core/io/stream_peer_tcp.h b/core/io/stream_peer_tcp.h index 9a14f57c28..fc84525c5f 100644 --- a/core/io/stream_peer_tcp.h +++ b/core/io/stream_peer_tcp.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STREAM_PEER_TCP_H #define STREAM_PEER_TCP_H diff --git a/core/io/tcp_server.cpp b/core/io/tcp_server.cpp index 5d33cd6f15..5916d58390 100644 --- a/core/io/tcp_server.cpp +++ b/core/io/tcp_server.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "tcp_server.h" TCP_Server *(*TCP_Server::_create)() = NULL; diff --git a/core/io/tcp_server.h b/core/io/tcp_server.h index 28c80f76f7..a250e8b249 100644 --- a/core/io/tcp_server.h +++ b/core/io/tcp_server.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TCP_SERVER_H #define TCP_SERVER_H diff --git a/core/io/translation_loader_po.cpp b/core/io/translation_loader_po.cpp index 0f62dbeb94..e01e2a84c5 100644 --- a/core/io/translation_loader_po.cpp +++ b/core/io/translation_loader_po.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "translation_loader_po.h" #include "os/file_access.h" #include "translation.h" diff --git a/core/io/translation_loader_po.h b/core/io/translation_loader_po.h index 82a2da103f..33cf9bd8b4 100644 --- a/core/io/translation_loader_po.h +++ b/core/io/translation_loader_po.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TRANSLATION_LOADER_PO_H #define TRANSLATION_LOADER_PO_H diff --git a/core/io/xml_parser.cpp b/core/io/xml_parser.cpp index a88150fa36..33c9b56d5a 100644 --- a/core/io/xml_parser.cpp +++ b/core/io/xml_parser.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "xml_parser.h" #include "print_string.h" //#define DEBUG_XML diff --git a/core/io/xml_parser.h b/core/io/xml_parser.h index 62d2d2bc94..297b57ffdc 100644 --- a/core/io/xml_parser.h +++ b/core/io/xml_parser.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef XML_PARSER_H #define XML_PARSER_H diff --git a/core/io/zip_io.h b/core/io/zip_io.h index d3c1d1fc57..3a7fdb0302 100644 --- a/core/io/zip_io.h +++ b/core/io/zip_io.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ZIP_IO_H #define ZIP_IO_H diff --git a/core/list.h b/core/list.h index 0c748aeb85..a00372e39f 100644 --- a/core/list.h +++ b/core/list.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GLOBALS_LIST_H #define GLOBALS_LIST_H diff --git a/core/map.h b/core/map.h index 1e47b42625..5ff269c26b 100644 --- a/core/map.h +++ b/core/map.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MAP_H #define MAP_H diff --git a/core/math/a_star.cpp b/core/math/a_star.cpp index cb90116d63..6908d7831d 100644 --- a/core/math/a_star.cpp +++ b/core/math/a_star.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "a_star.h" #include "geometry.h" #include "scene/scene_string_names.h" diff --git a/core/math/a_star.h b/core/math/a_star.h index 563f82826d..f89e17c7bb 100644 --- a/core/math/a_star.h +++ b/core/math/a_star.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ASTAR_H #define ASTAR_H diff --git a/core/math/aabb.cpp b/core/math/aabb.cpp index a6e5ced296..cff19f990c 100644 --- a/core/math/aabb.cpp +++ b/core/math/aabb.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "aabb.h" #include "print_string.h" diff --git a/core/math/aabb.h b/core/math/aabb.h index ff49337204..39b8f403e7 100644 --- a/core/math/aabb.h +++ b/core/math/aabb.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AABB_H #define AABB_H diff --git a/core/math/audio_frame.cpp b/core/math/audio_frame.cpp index d22b0f05f4..eff817bbaa 100644 --- a/core/math/audio_frame.cpp +++ b/core/math/audio_frame.cpp @@ -27,4 +27,5 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_frame.h" diff --git a/core/math/audio_frame.h b/core/math/audio_frame.h index fd58848c0b..67ba025e1c 100644 --- a/core/math/audio_frame.h +++ b/core/math/audio_frame.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIOFRAME_H #define AUDIOFRAME_H diff --git a/core/math/bsp_tree.cpp b/core/math/bsp_tree.cpp index 5d8ac000ad..b1424e1d78 100644 --- a/core/math/bsp_tree.cpp +++ b/core/math/bsp_tree.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "bsp_tree.h" #include "error_macros.h" #include "print_string.h" diff --git a/core/math/bsp_tree.h b/core/math/bsp_tree.h index 6a7b577fd0..fb16818ae7 100644 --- a/core/math/bsp_tree.h +++ b/core/math/bsp_tree.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BSP_TREE_H #define BSP_TREE_H diff --git a/core/math/camera_matrix.cpp b/core/math/camera_matrix.cpp index 8714a07336..1ab9b3532e 100644 --- a/core/math/camera_matrix.cpp +++ b/core/math/camera_matrix.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "camera_matrix.h" #include "math_funcs.h" #include "print_string.h" diff --git a/core/math/camera_matrix.h b/core/math/camera_matrix.h index 9dde244e58..226b4d572b 100644 --- a/core/math/camera_matrix.h +++ b/core/math/camera_matrix.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CAMERA_MATRIX_H #define CAMERA_MATRIX_H diff --git a/core/math/face3.cpp b/core/math/face3.cpp index e76719f736..801f2a3b4d 100644 --- a/core/math/face3.cpp +++ b/core/math/face3.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "face3.h" #include "geometry.h" diff --git a/core/math/face3.h b/core/math/face3.h index dd4cb25c82..faed0fa8d4 100644 --- a/core/math/face3.h +++ b/core/math/face3.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FACE3_H #define FACE3_H diff --git a/core/math/geometry.cpp b/core/math/geometry.cpp index a3b48320b1..24f077a4ca 100644 --- a/core/math/geometry.cpp +++ b/core/math/geometry.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "geometry.h" #include "print_string.h" diff --git a/core/math/geometry.h b/core/math/geometry.h index fefdd88794..ca4363e129 100644 --- a/core/math/geometry.h +++ b/core/math/geometry.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GEOMETRY_H #define GEOMETRY_H diff --git a/core/math/math_2d.cpp b/core/math/math_2d.cpp index 2c83bc1976..d2e4101999 100644 --- a/core/math/math_2d.cpp +++ b/core/math/math_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "math_2d.h" real_t Vector2::angle() const { diff --git a/core/math/math_2d.h b/core/math/math_2d.h index 32e1bb9152..8928349a44 100644 --- a/core/math/math_2d.h +++ b/core/math/math_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MATH_2D_H #define MATH_2D_H diff --git a/core/math/math_defs.h b/core/math/math_defs.h index e260bcd54f..d3484d8d02 100644 --- a/core/math/math_defs.h +++ b/core/math/math_defs.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MATH_DEFS_H #define MATH_DEFS_H diff --git a/core/math/math_funcs.cpp b/core/math/math_funcs.cpp index 1025e8be75..f060a8e4ab 100644 --- a/core/math/math_funcs.cpp +++ b/core/math/math_funcs.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "math_funcs.h" #include "core/os/os.h" diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h index d2d49d85d6..e15abc6b50 100644 --- a/core/math/math_funcs.h +++ b/core/math/math_funcs.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MATH_FUNCS_H #define MATH_FUNCS_H diff --git a/core/math/matrix3.cpp b/core/math/matrix3.cpp index ceaff04ae8..189b1ef9b3 100644 --- a/core/math/matrix3.cpp +++ b/core/math/matrix3.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "matrix3.h" #include "math_funcs.h" #include "os/copymem.h" diff --git a/core/math/octree.h b/core/math/octree.h index c874d60894..7411e4aa52 100644 --- a/core/math/octree.h +++ b/core/math/octree.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OCTREE_H #define OCTREE_H diff --git a/core/math/plane.cpp b/core/math/plane.cpp index c4e2f04fa6..78bb1771a4 100644 --- a/core/math/plane.cpp +++ b/core/math/plane.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "plane.h" #include "math_funcs.h" diff --git a/core/math/plane.h b/core/math/plane.h index 5497fde592..e567422dd0 100644 --- a/core/math/plane.h +++ b/core/math/plane.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PLANE_H #define PLANE_H diff --git a/core/math/quat.cpp b/core/math/quat.cpp index 5706848b35..9aa8b537d2 100644 --- a/core/math/quat.cpp +++ b/core/math/quat.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "quat.h" #include "matrix3.h" #include "print_string.h" diff --git a/core/math/quick_hull.cpp b/core/math/quick_hull.cpp index e13f2e9c18..102e454e02 100644 --- a/core/math/quick_hull.cpp +++ b/core/math/quick_hull.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "quick_hull.h" #include "map.h" diff --git a/core/math/quick_hull.h b/core/math/quick_hull.h index 40f601536f..eef4a9adff 100644 --- a/core/math/quick_hull.h +++ b/core/math/quick_hull.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef QUICK_HULL_H #define QUICK_HULL_H diff --git a/core/math/transform.cpp b/core/math/transform.cpp index ffad8cfc41..f727d00e30 100644 --- a/core/math/transform.cpp +++ b/core/math/transform.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "transform.h" #include "math_funcs.h" #include "os/copymem.h" diff --git a/core/math/transform.h b/core/math/transform.h index e5bc7832a0..c06eaec604 100644 --- a/core/math/transform.h +++ b/core/math/transform.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TRANSFORM_H #define TRANSFORM_H diff --git a/core/math/triangle_mesh.cpp b/core/math/triangle_mesh.cpp index 6138abc6b9..edd4ad3441 100644 --- a/core/math/triangle_mesh.cpp +++ b/core/math/triangle_mesh.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "triangle_mesh.h" #include "sort.h" diff --git a/core/math/triangle_mesh.h b/core/math/triangle_mesh.h index 4687b0e91b..9f145f2afb 100644 --- a/core/math/triangle_mesh.h +++ b/core/math/triangle_mesh.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TRIANGLE_MESH_H #define TRIANGLE_MESH_H diff --git a/core/math/triangulate.cpp b/core/math/triangulate.cpp index ff65142341..957e16f92c 100644 --- a/core/math/triangulate.cpp +++ b/core/math/triangulate.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "triangulate.h" real_t Triangulate::get_area(const Vector<Vector2> &contour) { diff --git a/core/math/triangulate.h b/core/math/triangulate.h index 01b4a50a3e..e336dc5756 100644 --- a/core/math/triangulate.h +++ b/core/math/triangulate.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TRIANGULATE_H #define TRIANGULATE_H diff --git a/core/math/vector3.cpp b/core/math/vector3.cpp index 02140bc337..78d52d5cd1 100644 --- a/core/math/vector3.cpp +++ b/core/math/vector3.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "vector3.h" #include "matrix3.h" diff --git a/core/math/vector3.h b/core/math/vector3.h index 17dbdafbd4..10ec4f5641 100644 --- a/core/math/vector3.h +++ b/core/math/vector3.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VECTOR3_H #define VECTOR3_H diff --git a/core/message_queue.cpp b/core/message_queue.cpp index b7b8827f4a..3ceafe1a30 100644 --- a/core/message_queue.cpp +++ b/core/message_queue.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "message_queue.h" #include "project_settings.h" diff --git a/core/message_queue.h b/core/message_queue.h index 7312f0e1e4..be5ffe4fae 100644 --- a/core/message_queue.h +++ b/core/message_queue.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MESSAGE_QUEUE_H #define MESSAGE_QUEUE_H diff --git a/core/method_bind.cpp b/core/method_bind.cpp index 4022b22ffe..52ee9e0848 100644 --- a/core/method_bind.cpp +++ b/core/method_bind.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + // object.h needs to be the first include *before* method_bind.h // FIXME: Find out why and fix potential cyclical dependencies. #include "object.h" diff --git a/core/method_bind.h b/core/method_bind.h index aaf3640ce9..2e5712c3fe 100644 --- a/core/method_bind.h +++ b/core/method_bind.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef METHOD_BIND_H #define METHOD_BIND_H diff --git a/core/method_ptrcall.h b/core/method_ptrcall.h index 1fe0cf0bc0..2007c3def5 100644 --- a/core/method_ptrcall.h +++ b/core/method_ptrcall.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef METHOD_PTRCALL_H #define METHOD_PTRCALL_H diff --git a/core/node_path.cpp b/core/node_path.cpp index abde887b35..cd7ad77534 100644 --- a/core/node_path.cpp +++ b/core/node_path.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "node_path.h" #include "print_string.h" diff --git a/core/node_path.h b/core/node_path.h index af134e8409..288f39721f 100644 --- a/core/node_path.h +++ b/core/node_path.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NODE_PATH_H #define NODE_PATH_H diff --git a/core/oa_hash_map.h b/core/oa_hash_map.h index 308624dcc3..c3b32af545 100644 --- a/core/oa_hash_map.h +++ b/core/oa_hash_map.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OA_HASH_MAP_H #define OA_HASH_MAP_H diff --git a/core/object.cpp b/core/object.cpp index 2e3196dc47..f9d733c11f 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "object.h" #include "class_db.h" diff --git a/core/object.h b/core/object.h index 635c599154..5de87b8a7d 100644 --- a/core/object.h +++ b/core/object.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OBJECT_H #define OBJECT_H diff --git a/core/ordered_hash_map.h b/core/ordered_hash_map.h index 5954952b6c..93ce9a90a7 100644 --- a/core/ordered_hash_map.h +++ b/core/ordered_hash_map.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ORDERED_HASH_MAP_H #define ORDERED_HASH_MAP_H diff --git a/core/os/copymem.h b/core/os/copymem.h index 998c0a8b9b..87d77bd426 100644 --- a/core/os/copymem.h +++ b/core/os/copymem.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COPYMEM_H #define COPYMEM_H diff --git a/core/os/dir_access.cpp b/core/os/dir_access.cpp index eadb8e8546..1941b82602 100644 --- a/core/os/dir_access.cpp +++ b/core/os/dir_access.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "dir_access.h" #include "os/file_access.h" #include "os/memory.h" diff --git a/core/os/dir_access.h b/core/os/dir_access.h index c94ced657b..4df0618021 100644 --- a/core/os/dir_access.h +++ b/core/os/dir_access.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DIR_ACCESS_H #define DIR_ACCESS_H diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp index 989230b162..368b4ad09d 100644 --- a/core/os/file_access.cpp +++ b/core/os/file_access.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access.h" #include "core/io/file_access_pack.h" diff --git a/core/os/file_access.h b/core/os/file_access.h index 61edc9a5db..5d10c1a9aa 100644 --- a/core/os/file_access.h +++ b/core/os/file_access.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_H #define FILE_ACCESS_H diff --git a/core/os/input.cpp b/core/os/input.cpp index a44adde425..3089ab2ce3 100644 --- a/core/os/input.cpp +++ b/core/os/input.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "input.h" #include "input_map.h" #include "os/os.h" diff --git a/core/os/input.h b/core/os/input.h index 140d11de4d..9c7595ff7f 100644 --- a/core/os/input.h +++ b/core/os/input.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef INPUT_H #define INPUT_H diff --git a/core/os/input_event.cpp b/core/os/input_event.cpp index 67590517fb..12060f31df 100644 --- a/core/os/input_event.cpp +++ b/core/os/input_event.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "input_event.h" #include "input_map.h" diff --git a/core/os/input_event.h b/core/os/input_event.h index 53da79f59f..72057659d2 100644 --- a/core/os/input_event.h +++ b/core/os/input_event.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef INPUT_EVENT_H #define INPUT_EVENT_H diff --git a/core/os/keyboard.cpp b/core/os/keyboard.cpp index 00d78d71f7..fa53cc85c8 100644 --- a/core/os/keyboard.cpp +++ b/core/os/keyboard.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "keyboard.h" #include "os/os.h" diff --git a/core/os/keyboard.h b/core/os/keyboard.h index f910f07f99..4c253fa4ce 100644 --- a/core/os/keyboard.h +++ b/core/os/keyboard.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef KEYBOARD_H #define KEYBOARD_H diff --git a/core/os/main_loop.cpp b/core/os/main_loop.cpp index 186acb0342..916c86613e 100644 --- a/core/os/main_loop.cpp +++ b/core/os/main_loop.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "main_loop.h" #include "script_language.h" diff --git a/core/os/main_loop.h b/core/os/main_loop.h index e5d917ec6b..546e4e280c 100644 --- a/core/os/main_loop.h +++ b/core/os/main_loop.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MAIN_LOOP_H #define MAIN_LOOP_H diff --git a/core/os/memory.cpp b/core/os/memory.cpp index a8b49a0852..3eab4343a9 100644 --- a/core/os/memory.cpp +++ b/core/os/memory.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "memory.h" #include "copymem.h" #include "core/safe_refcount.h" diff --git a/core/os/memory.h b/core/os/memory.h index 27eb57c873..f5c6c0b38a 100644 --- a/core/os/memory.h +++ b/core/os/memory.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MEMORY_H #define MEMORY_H diff --git a/core/os/mutex.cpp b/core/os/mutex.cpp index 21480fecee..7c4ea2323c 100644 --- a/core/os/mutex.cpp +++ b/core/os/mutex.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "mutex.h" #include "error_macros.h" #include <stddef.h> diff --git a/core/os/mutex.h b/core/os/mutex.h index ecd1f59151..9debe7f41b 100644 --- a/core/os/mutex.h +++ b/core/os/mutex.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MUTEX_H #define MUTEX_H diff --git a/core/os/os.cpp b/core/os/os.cpp index bdcdfed060..c6e5de703c 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "os.h" #include "dir_access.h" diff --git a/core/os/os.h b/core/os/os.h index a4f07df0e8..248e1dbefa 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OS_H #define OS_H diff --git a/core/os/rw_lock.cpp b/core/os/rw_lock.cpp index 9603ccf0bb..35489490ed 100644 --- a/core/os/rw_lock.cpp +++ b/core/os/rw_lock.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "rw_lock.h" #include "error_macros.h" diff --git a/core/os/rw_lock.h b/core/os/rw_lock.h index d0ce38f453..9053794c83 100644 --- a/core/os/rw_lock.h +++ b/core/os/rw_lock.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RWLOCK_H #define RWLOCK_H diff --git a/core/os/semaphore.cpp b/core/os/semaphore.cpp index 9455124e48..0377aeeb29 100644 --- a/core/os/semaphore.cpp +++ b/core/os/semaphore.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "semaphore.h" #include "error_macros.h" diff --git a/core/os/semaphore.h b/core/os/semaphore.h index 8bad64ace3..f3021bf74c 100644 --- a/core/os/semaphore.h +++ b/core/os/semaphore.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SEMAPHORE_H #define SEMAPHORE_H diff --git a/core/os/shell.cpp b/core/os/shell.cpp index 781d922d4b..32649a0667 100644 --- a/core/os/shell.cpp +++ b/core/os/shell.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "shell.h" Shell *Shell::singleton = NULL; diff --git a/core/os/shell.h b/core/os/shell.h index 84ac7eae42..d3d92028ea 100644 --- a/core/os/shell.h +++ b/core/os/shell.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHELL_H #define SHELL_H diff --git a/core/os/thread.cpp b/core/os/thread.cpp index 13bf147caf..250cf80a37 100644 --- a/core/os/thread.cpp +++ b/core/os/thread.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "thread.h" Thread *(*Thread::create_func)(ThreadCreateCallback, void *, const Settings &) = NULL; diff --git a/core/os/thread.h b/core/os/thread.h index 92dd00cf0d..c2947bccab 100644 --- a/core/os/thread.h +++ b/core/os/thread.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef THREAD_H #define THREAD_H diff --git a/core/os/thread_dummy.cpp b/core/os/thread_dummy.cpp index 2f8f3d4940..fa0bb3dafd 100644 --- a/core/os/thread_dummy.cpp +++ b/core/os/thread_dummy.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "thread_dummy.h" #include "memory.h" diff --git a/core/os/thread_dummy.h b/core/os/thread_dummy.h index 5681f45092..b67b52a726 100644 --- a/core/os/thread_dummy.h +++ b/core/os/thread_dummy.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef THREAD_DUMMY_H #define THREAD_DUMMY_H diff --git a/core/os/thread_safe.cpp b/core/os/thread_safe.cpp index 394876ae16..acb37df02b 100644 --- a/core/os/thread_safe.cpp +++ b/core/os/thread_safe.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "thread_safe.h" #include "error_macros.h" #include "os/memory.h" diff --git a/core/os/thread_safe.h b/core/os/thread_safe.h index 05510bcbb9..f0876f38a1 100644 --- a/core/os/thread_safe.h +++ b/core/os/thread_safe.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef THREAD_SAFE_H #define THREAD_SAFE_H diff --git a/core/os/threaded_array_processor.cpp b/core/os/threaded_array_processor.cpp deleted file mode 100644 index 8e92508ea5..0000000000 --- a/core/os/threaded_array_processor.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "threaded_array_processor.h" - diff --git a/core/os/threaded_array_processor.h b/core/os/threaded_array_processor.h index e584fbb193..e0fb589767 100644 --- a/core/os/threaded_array_processor.h +++ b/core/os/threaded_array_processor.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* threaded_array_processor.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ +/* */ +/* 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. */ +/*************************************************************************/ + #ifndef THREADED_ARRAY_PROCESSOR_H #define THREADED_ARRAY_PROCESSOR_H diff --git a/core/packed_data_container.cpp b/core/packed_data_container.cpp index 4d5890685b..eaccdba9bf 100644 --- a/core/packed_data_container.cpp +++ b/core/packed_data_container.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "packed_data_container.h" #include "core_string_names.h" diff --git a/core/packed_data_container.h b/core/packed_data_container.h index b711d795de..fe36417000 100644 --- a/core/packed_data_container.h +++ b/core/packed_data_container.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PACKED_DATA_CONTAINER_H #define PACKED_DATA_CONTAINER_H diff --git a/core/pair.h b/core/pair.h index 349c034ab7..1d35ae1b6c 100644 --- a/core/pair.h +++ b/core/pair.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PAIR_H #define PAIR_H diff --git a/core/path_remap.cpp b/core/path_remap.cpp index d92d034f1a..80308d72c0 100644 --- a/core/path_remap.cpp +++ b/core/path_remap.cpp @@ -27,4 +27,5 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "path_remap.h" diff --git a/core/path_remap.h b/core/path_remap.h index 1b40c9cace..5e25628aeb 100644 --- a/core/path_remap.h +++ b/core/path_remap.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PATH_REMAP_H #define PATH_REMAP_H diff --git a/core/pool_allocator.cpp b/core/pool_allocator.cpp index 13d5c5082f..d81e1912bf 100644 --- a/core/pool_allocator.cpp +++ b/core/pool_allocator.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "pool_allocator.h" #include "core/os/os.h" diff --git a/core/pool_allocator.h b/core/pool_allocator.h index a1cc65f1fd..d9731aa3eb 100644 --- a/core/pool_allocator.h +++ b/core/pool_allocator.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef POOL_ALLOCATOR_H #define POOL_ALLOCATOR_H diff --git a/core/print_string.cpp b/core/print_string.cpp index 2b366f8145..0355154488 100644 --- a/core/print_string.cpp +++ b/core/print_string.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "print_string.h" #include "os/os.h" diff --git a/core/print_string.h b/core/print_string.h index c3eaf3f336..3465888d4c 100644 --- a/core/print_string.h +++ b/core/print_string.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PRINT_STRING_H #define PRINT_STRING_H diff --git a/core/project_settings.cpp b/core/project_settings.cpp index bb2408fb1f..0c19de382c 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "project_settings.h" #include "bind/core_bind.h" diff --git a/core/project_settings.h b/core/project_settings.h index e60efea222..e85092e431 100644 --- a/core/project_settings.h +++ b/core/project_settings.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GLOBAL_CONFIG_H #define GLOBAL_CONFIG_H diff --git a/core/ref_ptr.cpp b/core/ref_ptr.cpp index 0f5abdd455..e3ef817df1 100644 --- a/core/ref_ptr.cpp +++ b/core/ref_ptr.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "ref_ptr.h" #include "reference.h" diff --git a/core/ref_ptr.h b/core/ref_ptr.h index 27acfb7982..a074718d22 100644 --- a/core/ref_ptr.h +++ b/core/ref_ptr.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REF_PTR_H #define REF_PTR_H /** diff --git a/core/reference.cpp b/core/reference.cpp index 3b5a9bc7cc..c33a7c683c 100644 --- a/core/reference.cpp +++ b/core/reference.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "reference.h" #include "script_language.h" diff --git a/core/reference.h b/core/reference.h index 16b912a402..a0bdb62258 100644 --- a/core/reference.h +++ b/core/reference.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REFERENCE_H #define REFERENCE_H diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp index 29c7cf4606..006459c5f6 100644 --- a/core/register_core_types.cpp +++ b/core/register_core_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_core_types.h" #include "bind/core_bind.h" diff --git a/core/register_core_types.h b/core/register_core_types.h index 4f5b7e03af..201da5cd07 100644 --- a/core/register_core_types.h +++ b/core/register_core_types.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REGISTER_CORE_TYPES_H #define REGISTER_CORE_TYPES_H diff --git a/core/resource.cpp b/core/resource.cpp index 3e411a8753..38f938932c 100644 --- a/core/resource.cpp +++ b/core/resource.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource.h" #include "core_string_names.h" diff --git a/core/resource.h b/core/resource.h index 4c5a44d7fd..60c63bfe7f 100644 --- a/core/resource.h +++ b/core/resource.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCE_H #define RESOURCE_H diff --git a/core/rid.cpp b/core/rid.cpp index 3cfb28c044..9661af9271 100644 --- a/core/rid.cpp +++ b/core/rid.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "rid.h" RID_Data::~RID_Data() { diff --git a/core/rid.h b/core/rid.h index 3768083fe3..42306aea36 100644 --- a/core/rid.h +++ b/core/rid.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RID_H #define RID_H diff --git a/core/ring_buffer.h b/core/ring_buffer.h index c8562a0570..de4757612a 100644 --- a/core/ring_buffer.h +++ b/core/ring_buffer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RINGBUFFER_H #define RINGBUFFER_H diff --git a/core/safe_refcount.h b/core/safe_refcount.h index 217cf69145..eff209c2db 100644 --- a/core/safe_refcount.h +++ b/core/safe_refcount.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SAFE_REFCOUNT_H #define SAFE_REFCOUNT_H diff --git a/core/script_debugger_local.cpp b/core/script_debugger_local.cpp index 83cdb348bd..57463a662d 100644 --- a/core/script_debugger_local.cpp +++ b/core/script_debugger_local.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "script_debugger_local.h" #include "os/os.h" diff --git a/core/script_debugger_local.h b/core/script_debugger_local.h index f1111612b3..c93120331d 100644 --- a/core/script_debugger_local.h +++ b/core/script_debugger_local.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCRIPT_DEBUGGER_LOCAL_H #define SCRIPT_DEBUGGER_LOCAL_H diff --git a/core/script_debugger_remote.cpp b/core/script_debugger_remote.cpp index a0a55ce86e..e3dc8eb53a 100644 --- a/core/script_debugger_remote.cpp +++ b/core/script_debugger_remote.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "script_debugger_remote.h" #include "engine.h" @@ -354,6 +355,13 @@ void ScriptDebuggerRemote::_get_output() { locking = false; } + if (n_messages_dropped > 0) { + Message msg; + msg.message = "Too many messages! " + String::num_int64(n_messages_dropped) + " messages were dropped."; + messages.push_back(msg); + n_messages_dropped = 0; + } + while (messages.size()) { locking = true; packet_peer_stream->put_var("message:" + messages.front()->get().message); @@ -365,6 +373,20 @@ void ScriptDebuggerRemote::_get_output() { locking = false; } + if (n_errors_dropped > 0) { + OutputError oe; + oe.error = "TOO_MANY_ERRORS"; + oe.error_descr = "Too many errors! " + String::num_int64(n_errors_dropped) + " errors were dropped."; + oe.warning = false; + uint64_t time = OS::get_singleton()->get_ticks_msec(); + oe.hr = time / 3600000; + oe.min = (time / 60000) % 60; + oe.sec = (time / 1000) % 60; + oe.msec = time % 1000; + errors.push_back(oe); + n_errors_dropped = 0; + } + while (errors.size()) { locking = true; packet_peer_stream->put_var("error"); @@ -452,7 +474,11 @@ void ScriptDebuggerRemote::_err_handler(void *ud, const char *p_func, const char if (!sdr->locking && sdr->tcp_client->is_connected_to_host()) { - sdr->errors.push_back(oe); + if (sdr->errors.size() >= sdr->max_errors_per_frame) { + sdr->n_errors_dropped++; + } else { + sdr->errors.push_back(oe); + } } sdr->mutex->unlock(); @@ -890,10 +916,14 @@ void ScriptDebuggerRemote::send_message(const String &p_message, const Array &p_ mutex->lock(); if (!locking && tcp_client->is_connected_to_host()) { - Message msg; - msg.message = p_message; - msg.data = p_args; - messages.push_back(msg); + if (messages.size() >= max_messages_per_frame) { + n_messages_dropped++; + } else { + Message msg; + msg.message = p_message; + msg.data = p_args; + messages.push_back(msg); + } } mutex->unlock(); } @@ -1010,7 +1040,11 @@ ScriptDebuggerRemote::ScriptDebuggerRemote() : requested_quit(false), mutex(Mutex::create()), max_cps(GLOBAL_GET("network/limits/debugger_stdout/max_chars_per_second")), + max_messages_per_frame(GLOBAL_GET("network/limits/debugger_stdout/max_messages_per_frame")), + max_errors_per_frame(GLOBAL_GET("network/limits/debugger_stdout/max_errors_per_frame")), char_count(0), + n_messages_dropped(0), + n_errors_dropped(0), last_msec(0), msec_count(0), locking(false), diff --git a/core/script_debugger_remote.h b/core/script_debugger_remote.h index 15afc866e3..924d5de2c4 100644 --- a/core/script_debugger_remote.h +++ b/core/script_debugger_remote.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCRIPT_DEBUGGER_REMOTE_H #define SCRIPT_DEBUGGER_REMOTE_H @@ -86,7 +87,11 @@ class ScriptDebuggerRemote : public ScriptDebugger { List<String> output_strings; List<Message> messages; + int max_messages_per_frame; + int n_messages_dropped; List<OutputError> errors; + int max_errors_per_frame; + int n_errors_dropped; int max_cps; int char_count; diff --git a/core/script_language.cpp b/core/script_language.cpp index 773eb29036..2a8c76c4b8 100644 --- a/core/script_language.cpp +++ b/core/script_language.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "script_language.h" ScriptLanguage *ScriptServer::_languages[MAX_LANGUAGES]; diff --git a/core/script_language.h b/core/script_language.h index 1a9d101ddd..6bf2129f9b 100644 --- a/core/script_language.h +++ b/core/script_language.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCRIPT_LANGUAGE_H #define SCRIPT_LANGUAGE_H diff --git a/core/self_list.h b/core/self_list.h index bb7f1a8a5b..e83afb66ef 100644 --- a/core/self_list.h +++ b/core/self_list.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SELF_LIST_H #define SELF_LIST_H diff --git a/core/set.h b/core/set.h index b2a8ee1636..4f17c953b1 100644 --- a/core/set.h +++ b/core/set.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SET_H #define SET_H diff --git a/core/simple_type.h b/core/simple_type.h index 5429719f02..a645d03181 100644 --- a/core/simple_type.h +++ b/core/simple_type.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SIMPLE_TYPE_H #define SIMPLE_TYPE_H diff --git a/core/sort.h b/core/sort.h index 94c2c1ecdf..a6780309d8 100644 --- a/core/sort.h +++ b/core/sort.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SORT_H #define SORT_H diff --git a/core/string_buffer.cpp b/core/string_buffer.cpp index 970477b90b..aac2090378 100644 --- a/core/string_buffer.cpp +++ b/core/string_buffer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "string_buffer.h" #include <string.h> diff --git a/core/string_buffer.h b/core/string_buffer.h index 4b502f3d92..f0ead66bb8 100644 --- a/core/string_buffer.h +++ b/core/string_buffer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STRING_BUFFER_H #define STRING_BUFFER_H diff --git a/core/string_builder.cpp b/core/string_builder.cpp index f24e23c986..4d567cbc03 100644 --- a/core/string_builder.cpp +++ b/core/string_builder.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "string_builder.h" #include <string.h> diff --git a/core/string_builder.h b/core/string_builder.h index 48e3fd663f..9e2599ac32 100644 --- a/core/string_builder.h +++ b/core/string_builder.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STRING_BUILDER_H #define STRING_BUILDER_H diff --git a/core/string_db.cpp b/core/string_db.cpp index 3d77aee0a1..6e1f887754 100644 --- a/core/string_db.cpp +++ b/core/string_db.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "string_db.h" #include "os/os.h" diff --git a/core/string_db.h b/core/string_db.h index 5e3086d4ec..28ca812a45 100644 --- a/core/string_db.h +++ b/core/string_db.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STRING_DB_H #define STRING_DB_H diff --git a/core/translation.cpp b/core/translation.cpp index 0c9af4e624..cf947404cd 100644 --- a/core/translation.cpp +++ b/core/translation.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "translation.h" #include "io/resource_loader.h" diff --git a/core/translation.h b/core/translation.h index b8ff1722f5..e7c0dcbc07 100644 --- a/core/translation.h +++ b/core/translation.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TRANSLATION_H #define TRANSLATION_H diff --git a/core/type_info.h b/core/type_info.h index 24d96c51e8..c1af4fac69 100644 --- a/core/type_info.h +++ b/core/type_info.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* type_info.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ +/* */ +/* 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. */ +/*************************************************************************/ + #ifndef GET_TYPE_INFO_H #define GET_TYPE_INFO_H diff --git a/core/typedefs.h b/core/typedefs.h index 9508fe28db..4758a5408d 100644 --- a/core/typedefs.h +++ b/core/typedefs.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TYPEDEFS_H #define TYPEDEFS_H diff --git a/core/ucaps.h b/core/ucaps.h index 764350504a..95bac1aac6 100644 --- a/core/ucaps.h +++ b/core/ucaps.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef UCAPS_H #define UCAPS_H diff --git a/core/undo_redo.cpp b/core/undo_redo.cpp index 46d38b3abc..a105fba290 100644 --- a/core/undo_redo.cpp +++ b/core/undo_redo.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "undo_redo.h" #include "os/os.h" @@ -107,6 +108,7 @@ void UndoRedo::create_action(const String &p_name, MergeMode p_mode) { void UndoRedo::add_do_method(Object *p_object, const String &p_method, VARIANT_ARG_DECLARE) { VARIANT_ARGPTRS + ERR_FAIL_COND(p_object == NULL); ERR_FAIL_COND(action_level <= 0); ERR_FAIL_COND((current_action + 1) >= actions.size()); Operation do_op; @@ -126,6 +128,7 @@ void UndoRedo::add_do_method(Object *p_object, const String &p_method, VARIANT_A void UndoRedo::add_undo_method(Object *p_object, const String &p_method, VARIANT_ARG_DECLARE) { VARIANT_ARGPTRS + ERR_FAIL_COND(p_object == NULL); ERR_FAIL_COND(action_level <= 0); ERR_FAIL_COND((current_action + 1) >= actions.size()); @@ -148,6 +151,7 @@ void UndoRedo::add_undo_method(Object *p_object, const String &p_method, VARIANT } void UndoRedo::add_do_property(Object *p_object, const String &p_property, const Variant &p_value) { + ERR_FAIL_COND(p_object == NULL); ERR_FAIL_COND(action_level <= 0); ERR_FAIL_COND((current_action + 1) >= actions.size()); Operation do_op; @@ -162,6 +166,7 @@ void UndoRedo::add_do_property(Object *p_object, const String &p_property, const } void UndoRedo::add_undo_property(Object *p_object, const String &p_property, const Variant &p_value) { + ERR_FAIL_COND(p_object == NULL); ERR_FAIL_COND(action_level <= 0); ERR_FAIL_COND((current_action + 1) >= actions.size()); @@ -181,6 +186,7 @@ void UndoRedo::add_undo_property(Object *p_object, const String &p_property, con } void UndoRedo::add_do_reference(Object *p_object) { + ERR_FAIL_COND(p_object == NULL); ERR_FAIL_COND(action_level <= 0); ERR_FAIL_COND((current_action + 1) >= actions.size()); Operation do_op; @@ -193,6 +199,7 @@ void UndoRedo::add_do_reference(Object *p_object) { } void UndoRedo::add_undo_reference(Object *p_object) { + ERR_FAIL_COND(p_object == NULL); ERR_FAIL_COND(action_level <= 0); ERR_FAIL_COND((current_action + 1) >= actions.size()); diff --git a/core/undo_redo.h b/core/undo_redo.h index 27bd7c2fd0..5d7ab782d6 100644 --- a/core/undo_redo.h +++ b/core/undo_redo.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef UNDO_REDO_H #define UNDO_REDO_H diff --git a/core/ustring.cpp b/core/ustring.cpp index 11d83a5733..528ecc52db 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "ustring.h" #include "color.h" diff --git a/core/ustring.h b/core/ustring.h index 8dd8b0fed3..90496b71b6 100644 --- a/core/ustring.h +++ b/core/ustring.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RSTRING_H #define RSTRING_H diff --git a/core/variant.cpp b/core/variant.cpp index 5d4879dba7..2e26169bfe 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "variant.h" #include "core_string_names.h" diff --git a/core/variant.h b/core/variant.h index 6c9204a18e..51ee8ea9d1 100644 --- a/core/variant.h +++ b/core/variant.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VARIANT_H #define VARIANT_H diff --git a/core/variant_call.cpp b/core/variant_call.cpp index 81e823b5db..e9f7af3f63 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "variant.h" #include "core_string_names.h" diff --git a/core/variant_construct_string.cpp b/core/variant_construct_string.cpp index 408e54bc99..2250c03f3d 100644 --- a/core/variant_construct_string.cpp +++ b/core/variant_construct_string.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "variant.h" class VariantConstruct { diff --git a/core/variant_op.cpp b/core/variant_op.cpp index 96b09c904d..e46fac77ee 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "variant.h" #include "core_string_names.h" @@ -338,7 +339,7 @@ bool Variant::booleanize() const { CASE_TYPE(m_prefix, m_op_name, m_name) { \ if (p_b.type == NIL) \ _RETURN(true) \ - DEFAULT_OP_ARRAY_OP_BODY(m_prefix, m_op_name, m_name, m_type, !=, ==, true, true, false) \ + DEFAULT_OP_ARRAY_OP_BODY(m_prefix, m_op_name, m_name, m_type, !=, !=, false, true, true) \ } #define DEFAULT_OP_ARRAY_LT(m_prefix, m_op_name, m_name, m_type) \ @@ -538,12 +539,12 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, if (arr_b->size() != l) _RETURN(true); for (int i = 0; i < l; i++) { - if (((*arr_a)[i] == (*arr_b)[i])) { - _RETURN(false); + if (((*arr_a)[i] != (*arr_b)[i])) { + _RETURN(true); } } - _RETURN(true); + _RETURN(false); } DEFAULT_OP_NUM_NULL(math, OP_NOT_EQUAL, INT, !=, _int); diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp index a78e18112d..54edb02347 100644 --- a/core/variant_parser.cpp +++ b/core/variant_parser.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "variant_parser.h" #include "core/string_buffer.h" diff --git a/core/variant_parser.h b/core/variant_parser.h index 18b6998f55..8d95595234 100644 --- a/core/variant_parser.h +++ b/core/variant_parser.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VARIANT_PARSER_H #define VARIANT_PARSER_H diff --git a/core/vector.h b/core/vector.h index 456d446a4b..f586471e27 100644 --- a/core/vector.h +++ b/core/vector.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VECTOR_H #define VECTOR_H diff --git a/core/version.h b/core/version.h index bf2f2c9d99..7a55d69ad7 100644 --- a/core/version.h +++ b/core/version.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "version_generated.gen.h" #ifdef VERSION_PATCH diff --git a/core/vmap.h b/core/vmap.h index 341fc273d4..8636c02997 100644 --- a/core/vmap.h +++ b/core/vmap.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VMAP_H #define VMAP_H diff --git a/core/vset.h b/core/vset.h index f4036c7c7e..449943b4a1 100644 --- a/core/vset.h +++ b/core/vset.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VSET_H #define VSET_H |