From 1f4f9c761ea43936fda426be5e25a8cf6c3b39d6 Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 18 Mar 2022 00:38:45 +0100 Subject: [PATCH] Version include cleanups to ESS. --- editor/fileserver/editor_file_server.h | 2 - .../biome_terrarin_generator.cpp | 4 - .../biome_terrarin_generator.h | 4 - .../data/atlases/character_atlas.h | 9 --- .../data/atlases/character_atlas_entry.h | 9 --- .../data/auras/aura_group.h | 9 --- .../data/items/craft_recipe.h | 11 --- .../data/items/craft_recipe_helper.h | 9 --- .../data/items/equipment_data.h | 9 --- .../data/items/item_instance.cpp | 6 -- .../data/items/item_instance.h | 10 --- .../data/items/item_template.h | 10 --- .../data/items/model_visual.h | 9 --- .../data/items/model_visual_entry.h | 13 +--- .../data/loot/loot_data_base.h | 10 --- .../data/species/entity_species_data.h | 11 --- .../data/species/species_instance.h | 9 --- .../data/species/species_model_data.cpp | 6 -- .../data/species/species_model_data.h | 22 ++---- .../entity_spell_system/data/spells/spell.h | 9 --- .../spells/spell_cooldown_manipulation_data.h | 8 -- .../data/spells/spell_effect_visual.h | 9 --- .../data/spells/spell_effect_visual_simple.h | 3 - .../database/ess_resource_db.h | 14 ---- .../database/ess_resource_db_folders.h | 25 ++----- .../database/ess_resource_db_map.h | 53 +++++-------- .../database/ess_resource_db_static.h | 23 ++---- modules/entity_spell_system/defines.h | 74 +------------------ .../drag_and_drop/es_drag_and_drop.h | 10 --- .../editor/ess_editor_plugin.h | 4 - .../entities/ai/entity_ai.h | 8 -- .../entities/auras/aura_data.cpp | 6 -- .../entities/auras/aura_data.h | 13 +--- .../entities/data/character_spec.h | 15 +--- .../entities/data/entity_class_data.h | 27 ++----- .../entities/data/entity_data.h | 13 +--- .../entities/data/entity_data_container.h | 12 +-- .../entities/data/item_container_data.h | 11 +-- .../entities/data/item_container_data_entry.h | 9 --- .../entities/data/vendor_item_data.h | 11 +-- .../entities/data/vendor_item_data_entry.h | 9 --- .../entity_spell_system/entities/entity.cpp | 63 ---------------- modules/entity_spell_system/entities/entity.h | 16 +--- .../entities/resources/entity_resource.h | 8 -- .../resources/entity_resource_cost_data.h | 9 --- .../entity_resource_cost_data_health.h | 9 --- .../entity_resource_cost_data_resource.h | 9 --- .../resources/entity_resource_health.h | 3 - .../resources/entity_resource_speed.h | 3 - .../entities/skills/entity_skill.cpp | 6 -- .../entities/skills/entity_skill.h | 8 -- .../entities/skills/entity_skill_data.h | 10 --- .../entities/stats/complex_level_stat_data.h | 8 -- .../entities/stats/level_stat_data.h | 8 -- .../entities/stats/simple_level_stat_data.h | 10 --- .../entities/stats/stat_data.h | 9 --- modules/entity_spell_system/entity_enums.h | 6 -- .../formations/ai_formation.h | 8 -- .../entity_spell_system/infos/aura_infos.h | 8 -- .../infos/spell_cast_info.h | 9 --- modules/entity_spell_system/inventory/bag.h | 9 --- .../entity_spell_system/inventory/grid_bag.h | 9 --- .../entity_spell_system/inventory/inventory.h | 9 --- .../inventory/normal_bag.h | 10 --- modules/entity_spell_system/item_enums.h | 6 -- .../material_cache/ess_material_cache.cpp | 13 ---- .../material_cache/ess_material_cache.h | 10 --- .../material_cache/ess_material_cache_pcm.h | 6 -- .../pipelines/spell_damage_info.h | 4 - .../pipelines/spell_heal_info.h | 7 -- .../actionbar/action_bar_button_entry.h | 5 -- .../profiles/actionbar/action_bar_entry.h | 7 -- .../profiles/actionbar/action_bar_profile.h | 8 -- .../profiles/class_profile.h | 6 -- .../profiles/input/input_profile.cpp | 5 -- .../profiles/input/input_profile.h | 10 --- .../profiles/input/input_profile_modifier.h | 6 -- .../input/input_profile_modifier_entry.h | 5 -- .../profiles/player_profile.h | 6 -- .../3d/spell_follow_projectile_3d.h | 2 +- modules/entity_spell_system/singletons/ess.h | 8 -- .../singletons/profile_manager.cpp | 5 -- .../singletons/profile_manager.h | 5 -- .../skeleton/character_bones.h | 3 - .../skeleton/character_skeleton_2d.h | 12 +-- .../skeleton/character_skeleton_3d.h | 12 +-- .../skeleton/entity_skeleton_data.h | 7 +- .../skeleton/skeleton_model_entry.h | 4 - .../spawners/ess_entity_spawner.h | 3 - modules/entity_spell_system/spell_enums.h | 5 -- .../utility/entity_create_info.h | 5 -- 91 files changed, 59 insertions(+), 901 deletions(-) diff --git a/editor/fileserver/editor_file_server.h b/editor/fileserver/editor_file_server.h index cdf275738..1efcb1448 100644 --- a/editor/fileserver/editor_file_server.h +++ b/editor/fileserver/editor_file_server.h @@ -31,8 +31,6 @@ /*************************************************************************/ - - #include "core/io/file_access_network.h" #include "core/io/packet_peer.h" #include "core/io/tcp_server.h" diff --git a/modules/broken_seals_module/biome_terrarin_generator.cpp b/modules/broken_seals_module/biome_terrarin_generator.cpp index 71b8afcee..9ee67e7b8 100644 --- a/modules/broken_seals_module/biome_terrarin_generator.cpp +++ b/modules/broken_seals_module/biome_terrarin_generator.cpp @@ -24,11 +24,7 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/config/engine.h" -#else #include "core/engine.h" -#endif #include "core/math/math_funcs.h" diff --git a/modules/broken_seals_module/biome_terrarin_generator.h b/modules/broken_seals_module/biome_terrarin_generator.h index 952e83a9e..3538a348b 100644 --- a/modules/broken_seals_module/biome_terrarin_generator.h +++ b/modules/broken_seals_module/biome_terrarin_generator.h @@ -27,11 +27,7 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/object/reference.h" -#else #include "core/reference.h" -#endif #ifdef VOXELMAN_PRESENT class VoxelChunk; diff --git a/modules/entity_spell_system/data/atlases/character_atlas.h b/modules/entity_spell_system/data/atlases/character_atlas.h index fd6e4a46d..b93b2f529 100644 --- a/modules/entity_spell_system/data/atlases/character_atlas.h +++ b/modules/entity_spell_system/data/atlases/character_atlas.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif class CharacterAtlas : public Resource { GDCLASS(CharacterAtlas, Resource); diff --git a/modules/entity_spell_system/data/atlases/character_atlas_entry.h b/modules/entity_spell_system/data/atlases/character_atlas_entry.h index ff4128677..8d5d37412 100644 --- a/modules/entity_spell_system/data/atlases/character_atlas_entry.h +++ b/modules/entity_spell_system/data/atlases/character_atlas_entry.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif class CharacterAtlasEntry : public Resource { GDCLASS(CharacterAtlasEntry, Resource); diff --git a/modules/entity_spell_system/data/auras/aura_group.h b/modules/entity_spell_system/data/auras/aura_group.h index a744e2490..7c6f4583b 100644 --- a/modules/entity_spell_system/data/auras/aura_group.h +++ b/modules/entity_spell_system/data/auras/aura_group.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif class AuraGroup : public Resource { GDCLASS(AuraGroup, Resource); diff --git a/modules/entity_spell_system/data/items/craft_recipe.h b/modules/entity_spell_system/data/items/craft_recipe.h index 50ddf1b1d..3a311ee88 100644 --- a/modules/entity_spell_system/data/items/craft_recipe.h +++ b/modules/entity_spell_system/data/items/craft_recipe.h @@ -22,20 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/templates/vector.h" -#include "core/string/ustring.h" -#else #include "core/resource.h" #include "core/vector.h" #include "core/ustring.h" -#endif #include "item_template.h" diff --git a/modules/entity_spell_system/data/items/craft_recipe_helper.h b/modules/entity_spell_system/data/items/craft_recipe_helper.h index c695504d2..33a481cf5 100644 --- a/modules/entity_spell_system/data/items/craft_recipe_helper.h +++ b/modules/entity_spell_system/data/items/craft_recipe_helper.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif #include "item_template.h" diff --git a/modules/entity_spell_system/data/items/equipment_data.h b/modules/entity_spell_system/data/items/equipment_data.h index 8172ea5db..212bda139 100644 --- a/modules/entity_spell_system/data/items/equipment_data.h +++ b/modules/entity_spell_system/data/items/equipment_data.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif class ItemInstance; class ItemTemplate; diff --git a/modules/entity_spell_system/data/items/item_instance.cpp b/modules/entity_spell_system/data/items/item_instance.cpp index 4a06dec75..a5faca46d 100644 --- a/modules/entity_spell_system/data/items/item_instance.cpp +++ b/modules/entity_spell_system/data/items/item_instance.cpp @@ -27,8 +27,6 @@ SOFTWARE. #include "../../database/ess_resource_db.h" #include "../../singletons/ess.h" -#include "core/version.h" - Ref ItemInstance::get_item_template() { return _item_template; } @@ -197,11 +195,7 @@ Dictionary ItemInstance::_to_dict() { return dict; } void ItemInstance::_from_dict(const Dictionary &dict) { -#if VERSION_MAJOR > 3 - ERR_FAIL_COND(dict.is_empty()); -#else ERR_FAIL_COND(dict.empty()); -#endif _item_template_path = dict.get("item_path", 0); diff --git a/modules/entity_spell_system/data/items/item_instance.h b/modules/entity_spell_system/data/items/item_instance.h index 86e178ff3..0d805a1de 100644 --- a/modules/entity_spell_system/data/items/item_instance.h +++ b/modules/entity_spell_system/data/items/item_instance.h @@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/templates/vector.h" -#else #include "core/resource.h" #include "core/vector.h" -#endif #include "../../item_enums.h" diff --git a/modules/entity_spell_system/data/items/item_template.h b/modules/entity_spell_system/data/items/item_template.h index 8657ea557..bd250f3d9 100644 --- a/modules/entity_spell_system/data/items/item_template.h +++ b/modules/entity_spell_system/data/items/item_template.h @@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/templates/vector.h" -#else #include "core/resource.h" #include "core/vector.h" -#endif #include "scene/resources/texture.h" diff --git a/modules/entity_spell_system/data/items/model_visual.h b/modules/entity_spell_system/data/items/model_visual.h index 499cf78c3..2558210ca 100644 --- a/modules/entity_spell_system/data/items/model_visual.h +++ b/modules/entity_spell_system/data/items/model_visual.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif #include "../../item_enums.h" #include "model_visual_entry.h" diff --git a/modules/entity_spell_system/data/items/model_visual_entry.h b/modules/entity_spell_system/data/items/model_visual_entry.h index 11eb8bc46..edce6482e 100644 --- a/modules/entity_spell_system/data/items/model_visual_entry.h +++ b/modules/entity_spell_system/data/items/model_visual_entry.h @@ -22,20 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/string/ustring.h" -#include "core/math/color.h" -#else +#include "core/color.h" #include "core/resource.h" #include "core/ustring.h" -#include "core/color.h" -#endif #include "scene/resources/texture.h" diff --git a/modules/entity_spell_system/data/loot/loot_data_base.h b/modules/entity_spell_system/data/loot/loot_data_base.h index 9f9cde7a1..47ceb6b6e 100644 --- a/modules/entity_spell_system/data/loot/loot_data_base.h +++ b/modules/entity_spell_system/data/loot/loot_data_base.h @@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/templates/vector.h" -#include "core/variant/array.h" -#else #include "core/vector.h" #include "core/array.h" -#endif #include "../items/item_template.h" diff --git a/modules/entity_spell_system/data/species/entity_species_data.h b/modules/entity_spell_system/data/species/entity_species_data.h index 52e6078f1..935ceff85 100644 --- a/modules/entity_spell_system/data/species/entity_species_data.h +++ b/modules/entity_spell_system/data/species/entity_species_data.h @@ -22,20 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/templates/vector.h" -#include "core/string/ustring.h" -#else #include "core/resource.h" #include "core/vector.h" #include "core/ustring.h" -#endif #include "../../entity_enums.h" diff --git a/modules/entity_spell_system/data/species/species_instance.h b/modules/entity_spell_system/data/species/species_instance.h index 78ead6c11..963ad0b8a 100644 --- a/modules/entity_spell_system/data/species/species_instance.h +++ b/modules/entity_spell_system/data/species/species_instance.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif #include "../items/model_visual_entry.h" diff --git a/modules/entity_spell_system/data/species/species_model_data.cpp b/modules/entity_spell_system/data/species/species_model_data.cpp index 5a76015c6..4e5a0bd48 100644 --- a/modules/entity_spell_system/data/species/species_model_data.cpp +++ b/modules/entity_spell_system/data/species/species_model_data.cpp @@ -22,16 +22,10 @@ SOFTWARE. #include "species_model_data.h" -#include "core/version.h" - #include "../../defines.h" #include "../../singletons/ess.h" -#if VERSION_MAJOR > 3 -#include "core/string/ustring.h" -#else #include "core/ustring.h" -#endif int SpeciesModelData::get_id() { diff --git a/modules/entity_spell_system/data/species/species_model_data.h b/modules/entity_spell_system/data/species/species_model_data.h index bb9f8bb09..a27daf0b0 100644 --- a/modules/entity_spell_system/data/species/species_model_data.h +++ b/modules/entity_spell_system/data/species/species_model_data.h @@ -22,22 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/templates/vector.h" -#include "core/string/ustring.h" -#include "core/math/color.h" -#else -#include "core/resource.h" -#include "core/vector.h" -#include "core/ustring.h" #include "core/color.h" -#endif +#include "core/resource.h" +#include "core/ustring.h" +#include "core/vector.h" #include "scene/resources/packed_scene.h" @@ -134,9 +122,9 @@ private: String _customizable_slots_string; String _customizable_color_slots_string; - Vector > _visuals; + Vector> _visuals; - Vector > > _customizable_slots; + Vector>> _customizable_slots; Vector _customizable_color_slots; }; diff --git a/modules/entity_spell_system/data/spells/spell.h b/modules/entity_spell_system/data/spells/spell.h index 7472ae7ba..fa1f02277 100644 --- a/modules/entity_spell_system/data/spells/spell.h +++ b/modules/entity_spell_system/data/spells/spell.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif #include "scene/resources/texture.h" diff --git a/modules/entity_spell_system/data/spells/spell_cooldown_manipulation_data.h b/modules/entity_spell_system/data/spells/spell_cooldown_manipulation_data.h index dd88da26d..0d7f27051 100644 --- a/modules/entity_spell_system/data/spells/spell_cooldown_manipulation_data.h +++ b/modules/entity_spell_system/data/spells/spell_cooldown_manipulation_data.h @@ -23,15 +23,7 @@ SOFTWARE. */ - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif class SpellCooldownManipulationData : public Reference { GDCLASS(SpellCooldownManipulationData, Reference); diff --git a/modules/entity_spell_system/data/spells/spell_effect_visual.h b/modules/entity_spell_system/data/spells/spell_effect_visual.h index 72bad45c4..f2fe703a1 100644 --- a/modules/entity_spell_system/data/spells/spell_effect_visual.h +++ b/modules/entity_spell_system/data/spells/spell_effect_visual.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif class SpellEffectVisual : public Resource { GDCLASS(SpellEffectVisual, Resource); diff --git a/modules/entity_spell_system/data/spells/spell_effect_visual_simple.h b/modules/entity_spell_system/data/spells/spell_effect_visual_simple.h index 53fc8286c..9931c3855 100644 --- a/modules/entity_spell_system/data/spells/spell_effect_visual_simple.h +++ b/modules/entity_spell_system/data/spells/spell_effect_visual_simple.h @@ -22,9 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - #include "spell_effect_visual.h" #include "scene/resources/packed_scene.h" diff --git a/modules/entity_spell_system/database/ess_resource_db.h b/modules/entity_spell_system/database/ess_resource_db.h index 24f34c972..76ef3e2e6 100644 --- a/modules/entity_spell_system/database/ess_resource_db.h +++ b/modules/entity_spell_system/database/ess_resource_db.h @@ -22,26 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/templates/vector.h" -#include "core/templates/hash_map.h" -#include "core/string/ustring.h" -#include "core/core_bind.h" -#include "core/variant/variant.h" -#else #include "core/resource.h" #include "core/vector.h" #include "core/hash_map.h" #include "core/ustring.h" #include "core/bind/core_bind.h" #include "core/variant.h" -#endif #include "../item_enums.h" diff --git a/modules/entity_spell_system/database/ess_resource_db_folders.h b/modules/entity_spell_system/database/ess_resource_db_folders.h index 07a438f58..0a234ca39 100644 --- a/modules/entity_spell_system/database/ess_resource_db_folders.h +++ b/modules/entity_spell_system/database/ess_resource_db_folders.h @@ -22,28 +22,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/variant/variant.h" -#include "core/templates/vector.h" -#include "core/templates/hash_map.h" -#include "core/string/ustring.h" -#include "core/config/engine.h" -#include "core/variant/array.h" -#include "core/core_bind.h" -#else -#include "core/variant.h" -#include "core/vector.h" -#include "core/hash_map.h" -#include "core/ustring.h" -#include "core/engine.h" #include "core/array.h" #include "core/bind/core_bind.h" -#endif +#include "core/engine.h" +#include "core/hash_map.h" +#include "core/ustring.h" +#include "core/variant.h" +#include "core/vector.h" #include "ess_resource_db_map.h" diff --git a/modules/entity_spell_system/database/ess_resource_db_map.h b/modules/entity_spell_system/database/ess_resource_db_map.h index 7b15b9289..f6d25ee07 100644 --- a/modules/entity_spell_system/database/ess_resource_db_map.h +++ b/modules/entity_spell_system/database/ess_resource_db_map.h @@ -22,30 +22,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - #include "ess_resource_db.h" -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/variant/variant.h" -#include "core/templates/vector.h" -#include "core/templates/hash_map.h" -#include "core/string/ustring.h" -#include "core/config/engine.h" -#include "core/variant/array.h" -#include "core/core_bind.h" -#else -#include "core/variant.h" -#include "core/vector.h" -#include "core/hash_map.h" -#include "core/ustring.h" -#include "core/engine.h" #include "core/array.h" #include "core/bind/core_bind.h" -#endif +#include "core/engine.h" +#include "core/hash_map.h" +#include "core/ustring.h" +#include "core/variant.h" +#include "core/vector.h" #include "scene/main/node.h" @@ -123,26 +108,26 @@ protected: static void _bind_methods(); private: - Vector > _entity_resources; - HashMap > _entity_resource_map; + Vector> _entity_resources; + HashMap> _entity_resource_map; - Vector > _entity_skills; - HashMap > _entity_skill_map; + Vector> _entity_skills; + HashMap> _entity_skill_map; - Vector > _entity_datas; - HashMap > _entity_data_map; + Vector> _entity_datas; + HashMap> _entity_data_map; - Vector > _spells; - HashMap > _spell_map; + Vector> _spells; + HashMap> _spell_map; - Vector > _craft_recipes; - HashMap > _craft_recipe_map; + Vector> _craft_recipes; + HashMap> _craft_recipe_map; - Vector > _item_templates; - HashMap > _item_template_map; + Vector> _item_templates; + HashMap> _item_template_map; - Vector > _entity_species_datas; - HashMap > _entity_species_data_map; + Vector> _entity_species_datas; + HashMap> _entity_species_data_map; }; #endif diff --git a/modules/entity_spell_system/database/ess_resource_db_static.h b/modules/entity_spell_system/database/ess_resource_db_static.h index bbd93b064..f4c29bd69 100644 --- a/modules/entity_spell_system/database/ess_resource_db_static.h +++ b/modules/entity_spell_system/database/ess_resource_db_static.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/templates/hash_map.h" -#else #include "core/hash_map.h" -#endif #include "ess_resource_db.h" @@ -122,13 +113,13 @@ protected: private: bool _remap_ids; - Vector > _entity_resources; - Vector > _entity_skills; - Vector > _entity_datas; - Vector > _spells; - Vector > _craft_recipes; - Vector > _item_templates; - Vector > _entity_species_datas; + Vector> _entity_resources; + Vector> _entity_skills; + Vector> _entity_datas; + Vector> _spells; + Vector> _craft_recipes; + Vector> _item_templates; + Vector> _entity_species_datas; }; #endif diff --git a/modules/entity_spell_system/defines.h b/modules/entity_spell_system/defines.h index f02c103dd..47ce158a3 100644 --- a/modules/entity_spell_system/defines.h +++ b/modules/entity_spell_system/defines.h @@ -2,70 +2,6 @@ #ifndef ESS_DEFINES_H #define ESS_DEFINES_H -#include "core/version.h" - -#if VERSION_MAJOR >= 4 -#define GODOT4 true -#endif - -//includes -#if GODOT4 -#define spatial_h_path "scene/3d/node_3d.h" -#define visual_server_h_path include "servers/rendering_server.h" - -//#include "core/input/input_event.h" -//#include "editor/plugins/node_3d_editor_plugin.h" -//#include "scene/3d/camera_3d.h" -#else -#define spatial_h_path "scene/3d/spatial.h" -#define visual_server_h_path include "servers/visual_server.h" - -//#include "core/os/input.h" -//#include "editor/plugins/spatial_editor_plugin.h" -//#include "scene/3d/camera.h" - -#endif - -//Type Defines -#if GODOT4 -#define PhysicsDirectSpaceState PhysicsDirectSpaceState3D -#define SpatialEditor Node3DEditor -#define SpatialEditorPlugin Node3DEditorPlugin -#define SpatialEditorViewport Node3DEditorViewport -#define PoolStringArray PackedStringArray - -#define REAL FLOAT - -#define POOL_STRING_ARRAY PACKED_STRING_ARRAY -#define POOL_INT_ARRAY PACKED_INT32_ARRAY -#define POOL_REAL_ARRAY PACKED_FLOAT32_ARRAY - -#define Spatial Node3D - -typedef class RenderingServer VisualServer; -typedef class RenderingServer VS; - -#define PoolVector3Array PackedVector3Array -#define PoolVector2Array PackedVector2Array -#define PoolColorArray PackedColorArray -#define PoolIntArray PackedInt64Array -#define PoolRealArray PackedFloat32Array - -//toodo figure out a way to have this -//#define Variant::CallError Callable::CallError -#endif - -#if GODOT4 - -#define VARIANT_ARRAY_GET(arr) \ - Vector r; \ - for (int i = 0; i < arr.size(); i++) { \ - r.push_back(arr[i]); \ - } \ - return r; - -#else - #define VARIANT_ARRAY_GET(arr) \ Vector r; \ for (int i = 0; i < arr.size(); i++) { \ @@ -73,8 +9,6 @@ typedef class RenderingServer VS; } \ return r; -#endif - #define VARIANT_ARRAY_SET(arr, arr_into, type) \ arr_into.clear(); \ for (int i = 0; i < arr.size(); i++) { \ @@ -82,15 +16,9 @@ typedef class RenderingServer VS; arr_into.push_back(e); \ } -#if GODOT4 -//TODO do this properly -#define INSTANCE_VALIDATE(var) var -#define CONNECT(sig, obj, target_method_class, method) connect(sig, callable_mp(obj, &target_method_class::method)) -#define DISCONNECT(sig, obj, target_method_class, method) disconnect(sig, callable_mp(obj, &target_method_class::method)) -#else + #define INSTANCE_VALIDATE(var) ObjectDB::instance_validate(var) #define CONNECT(sig, obj, target_method_class, method) connect(sig, obj, #method) #define DISCONNECT(sig, obj, target_method_class, method) disconnect(sig, obj, #method) -#endif #endif diff --git a/modules/entity_spell_system/drag_and_drop/es_drag_and_drop.h b/modules/entity_spell_system/drag_and_drop/es_drag_and_drop.h index 7f17975a8..6662aa480 100644 --- a/modules/entity_spell_system/drag_and_drop/es_drag_and_drop.h +++ b/modules/entity_spell_system/drag_and_drop/es_drag_and_drop.h @@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/object/reference.h" -#include "core/string/ustring.h" -#else #include "core/reference.h" #include "core/ustring.h" -#endif #include "scene/main/node.h" diff --git a/modules/entity_spell_system/editor/ess_editor_plugin.h b/modules/entity_spell_system/editor/ess_editor_plugin.h index 969d517fa..53aa0a9b4 100644 --- a/modules/entity_spell_system/editor/ess_editor_plugin.h +++ b/modules/entity_spell_system/editor/ess_editor_plugin.h @@ -22,16 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - #include "editor/editor_node.h" #include "editor/editor_plugin.h" #include "core/version.h" class ESSEditorPlugin : public EditorPlugin { - GDCLASS(ESSEditorPlugin, EditorPlugin); EditorNode *editor; diff --git a/modules/entity_spell_system/entities/ai/entity_ai.h b/modules/entity_spell_system/entities/ai/entity_ai.h index 63c297701..a42d7f9df 100644 --- a/modules/entity_spell_system/entities/ai/entity_ai.h +++ b/modules/entity_spell_system/entities/ai/entity_ai.h @@ -23,15 +23,7 @@ SOFTWARE. */ - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif #include "scene/main/node.h" diff --git a/modules/entity_spell_system/entities/auras/aura_data.cpp b/modules/entity_spell_system/entities/auras/aura_data.cpp index 40ef43454..634a9e881 100644 --- a/modules/entity_spell_system/entities/auras/aura_data.cpp +++ b/modules/entity_spell_system/entities/auras/aura_data.cpp @@ -22,8 +22,6 @@ SOFTWARE. #include "aura_data.h" -#include "core/version.h" - #include "../../data/spells/spell.h" #include "../../database/ess_resource_db.h" #include "../../singletons/ess.h" @@ -308,11 +306,7 @@ Dictionary AuraData::_to_dict() { return dict; } void AuraData::_from_dict(const Dictionary &dict) { -#if VERSION_MAJOR > 3 - ERR_FAIL_COND(dict.is_empty()); -#else ERR_FAIL_COND(dict.empty()); -#endif ERR_FAIL_COND(!ESS::get_singleton()->get_resource_db().is_valid()); _aura_id = dict.get("aura_id", 0); diff --git a/modules/entity_spell_system/entities/auras/aura_data.h b/modules/entity_spell_system/entities/auras/aura_data.h index 1fe6cc2a1..099a336dd 100644 --- a/modules/entity_spell_system/entities/auras/aura_data.h +++ b/modules/entity_spell_system/entities/auras/aura_data.h @@ -22,20 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/variant/array.h" -#include "core/variant/dictionary.h" -#else -#include "core/resource.h" #include "core/array.h" #include "core/dictionary.h" -#endif +#include "core/resource.h" #include "../../spell_enums.h" diff --git a/modules/entity_spell_system/entities/data/character_spec.h b/modules/entity_spell_system/entities/data/character_spec.h index fea034e9d..192e8f8fc 100644 --- a/modules/entity_spell_system/entities/data/character_spec.h +++ b/modules/entity_spell_system/entities/data/character_spec.h @@ -22,20 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/templates/vector.h" -#include "core/string/ustring.h" -#else #include "core/resource.h" -#include "core/vector.h" #include "core/ustring.h" -#endif +#include "core/vector.h" class Spell; @@ -74,7 +63,7 @@ protected: private: int _id; - Vector > > > _rows; + Vector>>> _rows; }; #endif diff --git a/modules/entity_spell_system/entities/data/entity_class_data.h b/modules/entity_spell_system/entities/data/entity_class_data.h index 65274f57e..b18ad527a 100644 --- a/modules/entity_spell_system/entities/data/entity_class_data.h +++ b/modules/entity_spell_system/entities/data/entity_class_data.h @@ -22,20 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/templates/vector.h" -#include "core/string/ustring.h" -#else #include "core/resource.h" -#include "core/vector.h" #include "core/ustring.h" -#endif +#include "core/vector.h" #include "core/math/math_funcs.h" #include "scene/resources/texture.h" @@ -190,18 +179,18 @@ private: Ref _stat_data; - Vector > _entity_resources; - Vector > _specs; - Vector > _spells; - Vector > _start_spells; - Vector > _auras; + Vector> _entity_resources; + Vector> _specs; + Vector> _spells; + Vector> _start_spells; + Vector> _auras; Ref _vendor_item_data; Ref _spell_train_data; Ref _item_container_data; - Vector > _craft_recipes; + Vector> _craft_recipes; - Vector > _ais; + Vector> _ais; }; #endif diff --git a/modules/entity_spell_system/entities/data/entity_data.h b/modules/entity_spell_system/entities/data/entity_data.h index 54015e007..35a661fc0 100644 --- a/modules/entity_spell_system/entities/data/entity_data.h +++ b/modules/entity_spell_system/entities/data/entity_data.h @@ -22,20 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/templates/vector.h" -#include "core/string/ustring.h" -#else #include "core/resource.h" -#include "core/vector.h" #include "core/ustring.h" -#endif +#include "core/vector.h" #include "scene/resources/texture.h" diff --git a/modules/entity_spell_system/entities/data/entity_data_container.h b/modules/entity_spell_system/entities/data/entity_data_container.h index d705dab6d..52e126efc 100644 --- a/modules/entity_spell_system/entities/data/entity_data_container.h +++ b/modules/entity_spell_system/entities/data/entity_data_container.h @@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/variant/dictionary.h" -#else -#include "core/resource.h" #include "core/dictionary.h" -#endif +#include "core/resource.h" class EntityDataContainer : public Resource { GDCLASS(EntityDataContainer, Resource); diff --git a/modules/entity_spell_system/entities/data/item_container_data.h b/modules/entity_spell_system/entities/data/item_container_data.h index 4b3edae1a..0d4ed720b 100644 --- a/modules/entity_spell_system/entities/data/item_container_data.h +++ b/modules/entity_spell_system/entities/data/item_container_data.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif #include "item_container_data_entry.h" @@ -55,7 +46,7 @@ protected: static void _bind_methods(); private: - Vector > _container_datas; + Vector> _container_datas; }; #endif diff --git a/modules/entity_spell_system/entities/data/item_container_data_entry.h b/modules/entity_spell_system/entities/data/item_container_data_entry.h index 0e5fa0fac..e5d162249 100644 --- a/modules/entity_spell_system/entities/data/item_container_data_entry.h +++ b/modules/entity_spell_system/entities/data/item_container_data_entry.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif class ItemTemplate; diff --git a/modules/entity_spell_system/entities/data/vendor_item_data.h b/modules/entity_spell_system/entities/data/vendor_item_data.h index 1049458a2..c09e60447 100644 --- a/modules/entity_spell_system/entities/data/vendor_item_data.h +++ b/modules/entity_spell_system/entities/data/vendor_item_data.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif #include "vendor_item_data_entry.h" @@ -55,7 +46,7 @@ protected: static void _bind_methods(); private: - Vector > _vendor_datas; + Vector> _vendor_datas; }; #endif diff --git a/modules/entity_spell_system/entities/data/vendor_item_data_entry.h b/modules/entity_spell_system/entities/data/vendor_item_data_entry.h index c834227f3..d84dd3e24 100644 --- a/modules/entity_spell_system/entities/data/vendor_item_data_entry.h +++ b/modules/entity_spell_system/entities/data/vendor_item_data_entry.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif class ItemTemplate; class Spell; diff --git a/modules/entity_spell_system/entities/entity.cpp b/modules/entity_spell_system/entities/entity.cpp index 1e845532c..ad6625c19 100644 --- a/modules/entity_spell_system/entities/entity.cpp +++ b/modules/entity_spell_system/entities/entity.cpp @@ -43,11 +43,7 @@ SOFTWARE. #include "./skills/entity_skill.h" #include "scene/2d/node_2d.h" -#if VERSION_MAJOR > 3 -#include "core/object/script_language.h" -#else #include "core/script_language.h" -#endif #include "core/version.h" @@ -650,22 +646,14 @@ void Entity::setup(Ref info) { sets_entity_name(info->get_entity_name()); } -#if VERSION_MAJOR > 3 - if (!info->get_serialized_data().is_empty()) { -#else if (!info->get_serialized_data().empty()) { -#endif from_dict(info->get_serialized_data()); } else { sets_entity_data(info->get_entity_data()); } if (has_method("_setup")) { -#if GODOT4 - call("_setup"); -#else call_multilevel("_setup"); -#endif } } @@ -1081,11 +1069,7 @@ void Entity::pet_removec_index(int index) { _c_pets.remove(index); - //#if VERSION_MAJOR < 4 //ERR_FAIL_COND(!ObjectDB::instance_validate(entity)); - //#else - //ERR_FAIL_COND(entity == NULL); - //#endif //full callback stack spet_added } @@ -1359,11 +1343,7 @@ Dictionary Entity::_to_dict() { return dict; } void Entity::_from_dict(const Dictionary &dict) { -#if VERSION_MAJOR > 3 - ERR_FAIL_COND(dict.is_empty()); -#else ERR_FAIL_COND(dict.empty()); -#endif //// Transforms //// @@ -1658,11 +1638,7 @@ void Entity::_from_dict(const Dictionary &dict) { Dictionary bagd = dict.get("bag", Dictionary()); -#if VERSION_MAJOR > 3 - if (!bagd.is_empty()) { -#else if (!bagd.empty()) { -#endif if (!_s_bag.is_valid()) { Ref bag; bag.instance(); @@ -1801,16 +1777,10 @@ PoolIntArray Entity::states_gets() const { PoolIntArray arr; arr.resize(EntityEnums::ENTITY_STATE_TYPE_INDEX_MAX); -#if !GODOT4 PoolIntArray::Write w = arr.write(); -#endif for (int i = 0; i < EntityEnums::ENTITY_STATE_TYPE_INDEX_MAX; ++i) { -#if !GODOT4 w[i] = _s_states[i]; -#else - arr.write[i] = _s_states[i]; -#endif } return arr; @@ -4943,16 +4913,10 @@ PoolIntArray Entity::sclass_talents_get() { PoolIntArray arr; arr.resize(_s_class_talents.size()); -#if !GODOT4 PoolIntArray::Write w = arr.write(); -#endif for (int i = 0; i < _s_class_talents.size(); ++i) { -#if !GODOT4 w[i] = _s_class_talents[i]; -#else - arr.write[i] = _s_class_talents[i]; -#endif } return arr; @@ -5190,16 +5154,10 @@ PoolIntArray Entity::scharacter_talents_get() { PoolIntArray arr; arr.resize(_s_character_talents.size()); -#if !GODOT4 PoolIntArray::Write w = arr.write(); -#endif for (int i = 0; i < _s_character_talents.size(); ++i) { -#if !GODOT4 w[i] = _s_character_talents[i]; -#else - arr.write[i] = _s_character_talents[i]; -#endif } return arr; @@ -5810,28 +5768,16 @@ void Entity::vrpc(const StringName &p_method, VARIANT_ARG_DECLARE) { rpcp(get_network_master(), false, p_method, argptr, argc); } -#if VERSION_MAJOR < 4 Variant Entity::_vrpc_bind(const Variant **p_args, int p_argcount, Variant::CallError &r_error) { -#else -Variant Entity::_vrpc_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error) { -#endif if (p_argcount < 1) { -#if VERSION_MAJOR < 4 r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS; -#else - r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS; -#endif r_error.argument = 1; return Variant(); } if (p_args[0]->get_type() != Variant::STRING) { -#if VERSION_MAJOR < 4 r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT; -#else - r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; -#endif r_error.argument = 0; r_error.expected = Variant::STRING; @@ -5843,12 +5789,7 @@ Variant Entity::_vrpc_bind(const Variant **p_args, int p_argcount, Callable::Cal for (int i = 0; i < _s_seen_by.size(); ++i) { Entity *e = _s_seen_by.get(i); -#if VERSION_MAJOR < 4 if (unlikely(!ObjectDB::instance_validate(e))) { -#else - if (unlikely(e == NULL)) { -#endif - _s_seen_by.remove(i); --i; continue; @@ -5862,11 +5803,7 @@ Variant Entity::_vrpc_bind(const Variant **p_args, int p_argcount, Callable::Cal //call(method, &p_args[1], p_argcount - 1); -#if VERSION_MAJOR < 4 r_error.error = Variant::CallError::CALL_OK; -#else - r_error.error = Callable::CallError::CALL_OK; -#endif return Variant(); } diff --git a/modules/entity_spell_system/entities/entity.h b/modules/entity_spell_system/entities/entity.h index c74dde9ea..6ad780ff7 100644 --- a/modules/entity_spell_system/entities/entity.h +++ b/modules/entity_spell_system/entities/entity.h @@ -23,19 +23,9 @@ SOFTWARE. */ - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/object/object.h" -#include "core/string/ustring.h" -#include "core/templates/vector.h" -#else #include "core/object.h" #include "core/ustring.h" #include "core/vector.h" -#endif #include "core/io/networked_multiplayer_peer.h" @@ -69,7 +59,7 @@ SOFTWARE. #include "../defines.h" -#include spatial_h_path +#include "scene/3d/spatial.h" class EntityData; class AuraData; @@ -1090,11 +1080,7 @@ public: int seen_by_gets_count(); void vrpc(const StringName &p_method, VARIANT_ARG_LIST); -#if VERSION_MAJOR < 4 Variant _vrpc_bind(const Variant **p_args, int p_argcount, Variant::CallError &r_error); -#else - Variant _vrpc_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error); -#endif Dictionary data_as_dict(String &data); diff --git a/modules/entity_spell_system/entities/resources/entity_resource.h b/modules/entity_spell_system/entities/resources/entity_resource.h index e9485543d..203fff8fc 100644 --- a/modules/entity_spell_system/entities/resources/entity_resource.h +++ b/modules/entity_spell_system/entities/resources/entity_resource.h @@ -23,15 +23,7 @@ SOFTWARE. */ - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif #include "../../defines.h" diff --git a/modules/entity_spell_system/entities/resources/entity_resource_cost_data.h b/modules/entity_spell_system/entities/resources/entity_resource_cost_data.h index e0db98b4c..1a12e6493 100644 --- a/modules/entity_spell_system/entities/resources/entity_resource_cost_data.h +++ b/modules/entity_spell_system/entities/resources/entity_resource_cost_data.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif #include "entity_resource.h" #include "entity_resource_cost_data.h" diff --git a/modules/entity_spell_system/entities/resources/entity_resource_cost_data_health.h b/modules/entity_spell_system/entities/resources/entity_resource_cost_data_health.h index 9e226f772..97b0276db 100644 --- a/modules/entity_spell_system/entities/resources/entity_resource_cost_data_health.h +++ b/modules/entity_spell_system/entities/resources/entity_resource_cost_data_health.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif #include "entity_resource.h" #include "entity_resource_cost_data.h" diff --git a/modules/entity_spell_system/entities/resources/entity_resource_cost_data_resource.h b/modules/entity_spell_system/entities/resources/entity_resource_cost_data_resource.h index 2463d4c2e..ff47cb086 100644 --- a/modules/entity_spell_system/entities/resources/entity_resource_cost_data_resource.h +++ b/modules/entity_spell_system/entities/resources/entity_resource_cost_data_resource.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif #include "entity_resource.h" #include "entity_resource_cost_data.h" diff --git a/modules/entity_spell_system/entities/resources/entity_resource_health.h b/modules/entity_spell_system/entities/resources/entity_resource_health.h index 8e9cb5db9..007b8ed5e 100644 --- a/modules/entity_spell_system/entities/resources/entity_resource_health.h +++ b/modules/entity_spell_system/entities/resources/entity_resource_health.h @@ -22,9 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - #include "entity_resource.h" class Entity; diff --git a/modules/entity_spell_system/entities/resources/entity_resource_speed.h b/modules/entity_spell_system/entities/resources/entity_resource_speed.h index b37b82caa..77222b448 100644 --- a/modules/entity_spell_system/entities/resources/entity_resource_speed.h +++ b/modules/entity_spell_system/entities/resources/entity_resource_speed.h @@ -22,9 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - #include "entity_resource.h" class Entity; diff --git a/modules/entity_spell_system/entities/skills/entity_skill.cpp b/modules/entity_spell_system/entities/skills/entity_skill.cpp index 144f46461..96aa3f170 100644 --- a/modules/entity_spell_system/entities/skills/entity_skill.cpp +++ b/modules/entity_spell_system/entities/skills/entity_skill.cpp @@ -22,8 +22,6 @@ SOFTWARE. #include "entity_skill.h" -#include "core/version.h" - #include "../../database/ess_resource_db.h" #include "../../singletons/ess.h" @@ -103,11 +101,7 @@ Dictionary EntitySkill::_to_dict() { return dict; } void EntitySkill::_from_dict(const Dictionary &dict) { -#if VERSION_MAJOR > 3 - ERR_FAIL_COND(dict.is_empty()); -#else ERR_FAIL_COND(dict.empty()); -#endif _skill_id = dict.get("skill_id", 0); _skill_path = dict.get("skill_path", ""); diff --git a/modules/entity_spell_system/entities/skills/entity_skill.h b/modules/entity_spell_system/entities/skills/entity_skill.h index cfc1e7786..c883f257c 100644 --- a/modules/entity_spell_system/entities/skills/entity_skill.h +++ b/modules/entity_spell_system/entities/skills/entity_skill.h @@ -23,15 +23,7 @@ SOFTWARE. */ - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif #include "entity_skill_data.h" diff --git a/modules/entity_spell_system/entities/skills/entity_skill_data.h b/modules/entity_spell_system/entities/skills/entity_skill_data.h index e5ad2f6b6..070092f71 100644 --- a/modules/entity_spell_system/entities/skills/entity_skill_data.h +++ b/modules/entity_spell_system/entities/skills/entity_skill_data.h @@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/string/ustring.h" -#else #include "core/resource.h" #include "core/ustring.h" -#endif class EntitySkillData : public Resource { GDCLASS(EntitySkillData, Resource); diff --git a/modules/entity_spell_system/entities/stats/complex_level_stat_data.h b/modules/entity_spell_system/entities/stats/complex_level_stat_data.h index 742940ab0..606a08b6c 100644 --- a/modules/entity_spell_system/entities/stats/complex_level_stat_data.h +++ b/modules/entity_spell_system/entities/stats/complex_level_stat_data.h @@ -23,15 +23,7 @@ SOFTWARE. */ - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif #include "../../entity_enums.h" #include "level_stat_data.h" diff --git a/modules/entity_spell_system/entities/stats/level_stat_data.h b/modules/entity_spell_system/entities/stats/level_stat_data.h index aadec07f6..608bbbe54 100644 --- a/modules/entity_spell_system/entities/stats/level_stat_data.h +++ b/modules/entity_spell_system/entities/stats/level_stat_data.h @@ -23,15 +23,7 @@ SOFTWARE. */ - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif class LevelStatData : public Resource { GDCLASS(LevelStatData, Resource); diff --git a/modules/entity_spell_system/entities/stats/simple_level_stat_data.h b/modules/entity_spell_system/entities/stats/simple_level_stat_data.h index 7ee1c50b0..2d323d4c5 100644 --- a/modules/entity_spell_system/entities/stats/simple_level_stat_data.h +++ b/modules/entity_spell_system/entities/stats/simple_level_stat_data.h @@ -23,16 +23,6 @@ SOFTWARE. */ - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else -#include "core/resource.h" -#endif - #include "level_stat_data.h" class SimpleLevelStatData : public LevelStatData { diff --git a/modules/entity_spell_system/entities/stats/stat_data.h b/modules/entity_spell_system/entities/stats/stat_data.h index 67d4d67ce..4271b20cc 100644 --- a/modules/entity_spell_system/entities/stats/stat_data.h +++ b/modules/entity_spell_system/entities/stats/stat_data.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif #include "scene/resources/curve.h" diff --git a/modules/entity_spell_system/entity_enums.h b/modules/entity_spell_system/entity_enums.h index dcec36ca6..08fcf5440 100644 --- a/modules/entity_spell_system/entity_enums.h +++ b/modules/entity_spell_system/entity_enums.h @@ -27,14 +27,8 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/object/object.h" -#include "core/string/ustring.h" -#include "core/object/class_db.h" -#else #include "core/object.h" #include "core/ustring.h" -#endif class EntityEnums : public Object { GDCLASS(EntityEnums, Object); diff --git a/modules/entity_spell_system/formations/ai_formation.h b/modules/entity_spell_system/formations/ai_formation.h index f2239d963..2bba12e59 100644 --- a/modules/entity_spell_system/formations/ai_formation.h +++ b/modules/entity_spell_system/formations/ai_formation.h @@ -23,15 +23,7 @@ SOFTWARE. */ - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif #include "scene/main/node.h" diff --git a/modules/entity_spell_system/infos/aura_infos.h b/modules/entity_spell_system/infos/aura_infos.h index 75d5ee272..f415684eb 100644 --- a/modules/entity_spell_system/infos/aura_infos.h +++ b/modules/entity_spell_system/infos/aura_infos.h @@ -23,15 +23,7 @@ SOFTWARE. */ - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/object/reference.h" -#else #include "core/reference.h" -#endif #include "../entities/entity.h" diff --git a/modules/entity_spell_system/infos/spell_cast_info.h b/modules/entity_spell_system/infos/spell_cast_info.h index f42df6466..3284349ad 100644 --- a/modules/entity_spell_system/infos/spell_cast_info.h +++ b/modules/entity_spell_system/infos/spell_cast_info.h @@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#else #include "core/resource.h" -#endif class Spell; class Entity; diff --git a/modules/entity_spell_system/inventory/bag.h b/modules/entity_spell_system/inventory/bag.h index 7abf709fa..cba215e39 100644 --- a/modules/entity_spell_system/inventory/bag.h +++ b/modules/entity_spell_system/inventory/bag.h @@ -23,17 +23,8 @@ SOFTWARE. */ - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/templates/vector.h" -#else #include "core/resource.h" #include "core/vector.h" -#endif #include "../item_enums.h" diff --git a/modules/entity_spell_system/inventory/grid_bag.h b/modules/entity_spell_system/inventory/grid_bag.h index c16c584df..6349a72e4 100644 --- a/modules/entity_spell_system/inventory/grid_bag.h +++ b/modules/entity_spell_system/inventory/grid_bag.h @@ -23,17 +23,8 @@ SOFTWARE. */ - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/templates/vector.h" -#else #include "core/resource.h" #include "core/vector.h" -#endif #include "../item_enums.h" diff --git a/modules/entity_spell_system/inventory/inventory.h b/modules/entity_spell_system/inventory/inventory.h index fdf2b7470..717cf0f63 100644 --- a/modules/entity_spell_system/inventory/inventory.h +++ b/modules/entity_spell_system/inventory/inventory.h @@ -23,17 +23,8 @@ SOFTWARE. */ - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/templates/vector.h" -#else #include "core/resource.h" #include "core/vector.h" -#endif #include "../item_enums.h" diff --git a/modules/entity_spell_system/inventory/normal_bag.h b/modules/entity_spell_system/inventory/normal_bag.h index 51c30f925..9cfc5b68c 100644 --- a/modules/entity_spell_system/inventory/normal_bag.h +++ b/modules/entity_spell_system/inventory/normal_bag.h @@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/templates/vector.h" -#else #include "core/resource.h" #include "core/vector.h" -#endif #include "../item_enums.h" diff --git a/modules/entity_spell_system/item_enums.h b/modules/entity_spell_system/item_enums.h index bf4dd9b2d..1d5dc2b0e 100644 --- a/modules/entity_spell_system/item_enums.h +++ b/modules/entity_spell_system/item_enums.h @@ -27,14 +27,8 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/object/object.h" -#include "core/string/ustring.h" -#include "core/object/class_db.h" -#else #include "core/object.h" #include "core/ustring.h" -#endif class ItemEnums : public Object { GDCLASS(ItemEnums, Object); diff --git a/modules/entity_spell_system/material_cache/ess_material_cache.cpp b/modules/entity_spell_system/material_cache/ess_material_cache.cpp index b689c58b2..0ad92b003 100644 --- a/modules/entity_spell_system/material_cache/ess_material_cache.cpp +++ b/modules/entity_spell_system/material_cache/ess_material_cache.cpp @@ -38,17 +38,6 @@ SOFTWARE. #include "../singletons/ess.h" -#if VERSION_MAJOR > 3 - -#define VARIANT_ARRAY_GET(arr) \ - Vector r; \ - for (int i = 0; i < arr.size(); i++) { \ - r.push_back(arr[i]); \ - } \ - return r; - -#else - #define VARIANT_ARRAY_GET(arr) \ Vector r; \ for (int i = 0; i < arr.size(); i++) { \ @@ -56,8 +45,6 @@ SOFTWARE. } \ return r; -#endif - bool ESSMaterialCache::get_initialized() { return _initialized; } diff --git a/modules/entity_spell_system/material_cache/ess_material_cache.h b/modules/entity_spell_system/material_cache/ess_material_cache.h index dfb9b996b..2b891401d 100644 --- a/modules/entity_spell_system/material_cache/ess_material_cache.h +++ b/modules/entity_spell_system/material_cache/ess_material_cache.h @@ -23,19 +23,9 @@ SOFTWARE. */ - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/math/color.h" -#include "core/templates/vector.h" -#else #include "core/color.h" #include "core/resource.h" #include "core/vector.h" -#endif #include "core/math/rect2.h" #include "scene/resources/material.h" diff --git a/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h b/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h index 09fbc9ba1..8c962c2e4 100644 --- a/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h +++ b/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h @@ -29,15 +29,9 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/math/color.h" -#include "core/templates/vector.h" -#else #include "core/color.h" #include "core/resource.h" #include "core/vector.h" -#endif #include "core/math/rect2.h" #include "scene/resources/material.h" diff --git a/modules/entity_spell_system/pipelines/spell_damage_info.h b/modules/entity_spell_system/pipelines/spell_damage_info.h index 89908ffee..3b049a109 100644 --- a/modules/entity_spell_system/pipelines/spell_damage_info.h +++ b/modules/entity_spell_system/pipelines/spell_damage_info.h @@ -27,11 +27,7 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/object/reference.h" -#else #include "core/reference.h" -#endif #include "../spell_enums.h" #include "scene/main/node.h" diff --git a/modules/entity_spell_system/pipelines/spell_heal_info.h b/modules/entity_spell_system/pipelines/spell_heal_info.h index a597db796..add4926b5 100644 --- a/modules/entity_spell_system/pipelines/spell_heal_info.h +++ b/modules/entity_spell_system/pipelines/spell_heal_info.h @@ -24,14 +24,7 @@ SOFTWARE. - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/object/reference.h" -#else #include "core/reference.h" -#endif #include "../spell_enums.h" #include "scene/main/node.h" diff --git a/modules/entity_spell_system/profiles/actionbar/action_bar_button_entry.h b/modules/entity_spell_system/profiles/actionbar/action_bar_button_entry.h index e872c0a0f..6f2768b4b 100644 --- a/modules/entity_spell_system/profiles/actionbar/action_bar_button_entry.h +++ b/modules/entity_spell_system/profiles/actionbar/action_bar_button_entry.h @@ -27,13 +27,8 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/object/reference.h" -#include "core/variant/dictionary.h" -#else #include "core/reference.h" #include "core/dictionary.h" -#endif class ActionBarEntry; diff --git a/modules/entity_spell_system/profiles/actionbar/action_bar_entry.h b/modules/entity_spell_system/profiles/actionbar/action_bar_entry.h index b8f72386b..b4bae9d3f 100644 --- a/modules/entity_spell_system/profiles/actionbar/action_bar_entry.h +++ b/modules/entity_spell_system/profiles/actionbar/action_bar_entry.h @@ -27,17 +27,10 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/object/reference.h" -#include "core/templates/vector.h" -#include "core/variant/array.h" -#include "core/variant/dictionary.h" -#else #include "core/reference.h" #include "core/vector.h" #include "core/array.h" #include "core/dictionary.h" -#endif #include "action_bar_button_entry.h" diff --git a/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h b/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h index b2ebd0061..52c358568 100644 --- a/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h +++ b/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h @@ -27,19 +27,11 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/object/reference.h" -#include "core/templates/vector.h" -#include "core/string/ustring.h" -#include "core/variant/array.h" -#include "core/variant/dictionary.h" -#else #include "core/reference.h" #include "core/vector.h" #include "core/ustring.h" #include "core/array.h" #include "core/dictionary.h" -#endif #include "action_bar_entry.h" diff --git a/modules/entity_spell_system/profiles/class_profile.h b/modules/entity_spell_system/profiles/class_profile.h index 3e6e48f16..1910f0e24 100644 --- a/modules/entity_spell_system/profiles/class_profile.h +++ b/modules/entity_spell_system/profiles/class_profile.h @@ -27,15 +27,9 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/object/reference.h" -#include "core/string/ustring.h" -#include "core/variant/dictionary.h" -#else #include "core/reference.h" #include "core/ustring.h" #include "core/dictionary.h" -#endif #include "actionbar/action_bar_profile.h" #include "input/input_profile.h" diff --git a/modules/entity_spell_system/profiles/input/input_profile.cpp b/modules/entity_spell_system/profiles/input/input_profile.cpp index 6e384fb9e..1ff399e34 100644 --- a/modules/entity_spell_system/profiles/input/input_profile.cpp +++ b/modules/entity_spell_system/profiles/input/input_profile.cpp @@ -24,13 +24,8 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/string/ustring.h" -#include "core/config/project_settings.h" -#else #include "core/ustring.h" #include "core/project_settings.h" -#endif #include "../class_profile.h" diff --git a/modules/entity_spell_system/profiles/input/input_profile.h b/modules/entity_spell_system/profiles/input/input_profile.h index b686805c6..e99ea4666 100644 --- a/modules/entity_spell_system/profiles/input/input_profile.h +++ b/modules/entity_spell_system/profiles/input/input_profile.h @@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - -#include "core/version.h" - -#if VERSION_MAJOR > 3 -#include "core/object/reference.h" -#include "core/string/ustring.h" -#else #include "core/reference.h" #include "core/ustring.h" -#endif class ClassProfile; diff --git a/modules/entity_spell_system/profiles/input/input_profile_modifier.h b/modules/entity_spell_system/profiles/input/input_profile_modifier.h index 0b03545fd..b11292ee3 100644 --- a/modules/entity_spell_system/profiles/input/input_profile_modifier.h +++ b/modules/entity_spell_system/profiles/input/input_profile_modifier.h @@ -27,15 +27,9 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/object/reference.h" -#include "core/templates/vector.h" -#include "core/string/ustring.h" -#else #include "core/reference.h" #include "core/vector.h" #include "core/ustring.h" -#endif #include "input_profile_modifier_entry.h" diff --git a/modules/entity_spell_system/profiles/input/input_profile_modifier_entry.h b/modules/entity_spell_system/profiles/input/input_profile_modifier_entry.h index 490f50670..4cc3e4609 100644 --- a/modules/entity_spell_system/profiles/input/input_profile_modifier_entry.h +++ b/modules/entity_spell_system/profiles/input/input_profile_modifier_entry.h @@ -27,13 +27,8 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/object/reference.h" -#include "core/string/ustring.h" -#else #include "core/reference.h" #include "core/ustring.h" -#endif class InputProfileModifierEntry : public Reference { GDCLASS(InputProfileModifierEntry, Reference); diff --git a/modules/entity_spell_system/profiles/player_profile.h b/modules/entity_spell_system/profiles/player_profile.h index da58c9fbc..2898bce92 100644 --- a/modules/entity_spell_system/profiles/player_profile.h +++ b/modules/entity_spell_system/profiles/player_profile.h @@ -27,15 +27,9 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/object/reference.h" -#include "core/string/ustring.h" -#include "core/variant/dictionary.h" -#else #include "core/reference.h" #include "core/ustring.h" #include "core/dictionary.h" -#endif #include "class_profile.h" diff --git a/modules/entity_spell_system/projectiles/3d/spell_follow_projectile_3d.h b/modules/entity_spell_system/projectiles/3d/spell_follow_projectile_3d.h index d9df06351..40913916d 100644 --- a/modules/entity_spell_system/projectiles/3d/spell_follow_projectile_3d.h +++ b/modules/entity_spell_system/projectiles/3d/spell_follow_projectile_3d.h @@ -27,7 +27,7 @@ SOFTWARE. #include "../../defines.h" -#include spatial_h_path +#include "scene/3d/spatial.h" class SpellCastInfo; diff --git a/modules/entity_spell_system/singletons/ess.h b/modules/entity_spell_system/singletons/ess.h index 99ae800d0..75f5046b9 100644 --- a/modules/entity_spell_system/singletons/ess.h +++ b/modules/entity_spell_system/singletons/ess.h @@ -27,19 +27,11 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/config/engine.h" -#include "core/core_bind.h" -#include "core/io/resource.h" -#include "core/object/object.h" -#include "core/string/ustring.h" -#else #include "core/bind/core_bind.h" #include "core/engine.h" #include "core/object.h" #include "core/resource.h" #include "core/ustring.h" -#endif #include "scene/main/node.h" diff --git a/modules/entity_spell_system/singletons/profile_manager.cpp b/modules/entity_spell_system/singletons/profile_manager.cpp index 2390052d6..56a1288c0 100644 --- a/modules/entity_spell_system/singletons/profile_manager.cpp +++ b/modules/entity_spell_system/singletons/profile_manager.cpp @@ -26,13 +26,8 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/config/engine.h" -#include "core/config/project_settings.h" -#else #include "core/engine.h" #include "core/project_settings.h" -#endif #include "../defines.h" diff --git a/modules/entity_spell_system/singletons/profile_manager.h b/modules/entity_spell_system/singletons/profile_manager.h index ad1df8c67..447033218 100644 --- a/modules/entity_spell_system/singletons/profile_manager.h +++ b/modules/entity_spell_system/singletons/profile_manager.h @@ -27,13 +27,8 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/object/object.h" -#include "core/templates/vector.h" -#else #include "core/object.h" #include "core/vector.h" -#endif #include "../profiles/player_profile.h" diff --git a/modules/entity_spell_system/skeleton/character_bones.h b/modules/entity_spell_system/skeleton/character_bones.h index b979b255f..b425881d0 100644 --- a/modules/entity_spell_system/skeleton/character_bones.h +++ b/modules/entity_spell_system/skeleton/character_bones.h @@ -22,9 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - #include "scene/2d/node_2d.h" class CharacterBones : public Node2D { diff --git a/modules/entity_spell_system/skeleton/character_skeleton_2d.h b/modules/entity_spell_system/skeleton/character_skeleton_2d.h index f9ce746fb..57620d6e8 100644 --- a/modules/entity_spell_system/skeleton/character_skeleton_2d.h +++ b/modules/entity_spell_system/skeleton/character_skeleton_2d.h @@ -27,15 +27,9 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/templates/vector.h" -#include "core/string/ustring.h" -#include "core/string/node_path.h" -#else #include "core/vector.h" #include "core/ustring.h" #include "core/node_path.h" -#endif #include "scene/2d/node_2d.h" @@ -51,11 +45,7 @@ SOFTWARE. #include "../defines.h" -#include spatial_h_path - -#if GODOT4 -#define Texture Texture2D -#endif +#include "scene/3d/spatial.h" class ModelVisual; diff --git a/modules/entity_spell_system/skeleton/character_skeleton_3d.h b/modules/entity_spell_system/skeleton/character_skeleton_3d.h index e746f9a14..ea93ba714 100644 --- a/modules/entity_spell_system/skeleton/character_skeleton_3d.h +++ b/modules/entity_spell_system/skeleton/character_skeleton_3d.h @@ -27,15 +27,9 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/templates/vector.h" -#include "core/string/ustring.h" -#include "core/string/node_path.h" -#else #include "core/vector.h" #include "core/ustring.h" #include "core/node_path.h" -#endif #include "scene/main/node.h" @@ -49,11 +43,7 @@ SOFTWARE. #include "../defines.h" -#include spatial_h_path - -#if GODOT4 -#define Texture Texture2D -#endif +#include "scene/3d/spatial.h" class ModelVisual; diff --git a/modules/entity_spell_system/skeleton/entity_skeleton_data.h b/modules/entity_spell_system/skeleton/entity_skeleton_data.h index 19da5db0e..43fdf46bb 100644 --- a/modules/entity_spell_system/skeleton/entity_skeleton_data.h +++ b/modules/entity_spell_system/skeleton/entity_skeleton_data.h @@ -27,13 +27,10 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/io/resource.h" -#include "core/string/ustring.h" -#else #include "core/resource.h" #include "core/ustring.h" -#endif + +class CharacterSkeletonVisualEntry; class EntitySkeletonData : public Resource { GDCLASS(EntitySkeletonData, Resource); diff --git a/modules/entity_spell_system/skeleton/skeleton_model_entry.h b/modules/entity_spell_system/skeleton/skeleton_model_entry.h index fe878da5f..be7ffcd84 100644 --- a/modules/entity_spell_system/skeleton/skeleton_model_entry.h +++ b/modules/entity_spell_system/skeleton/skeleton_model_entry.h @@ -27,11 +27,7 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/object/reference.h" -#else #include "core/reference.h" -#endif #include "../data/items/model_visual_entry.h" diff --git a/modules/entity_spell_system/spawners/ess_entity_spawner.h b/modules/entity_spell_system/spawners/ess_entity_spawner.h index 537c37fa6..d4dfb3814 100644 --- a/modules/entity_spell_system/spawners/ess_entity_spawner.h +++ b/modules/entity_spell_system/spawners/ess_entity_spawner.h @@ -22,9 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - - #include "scene/main/node.h" #include "scene/main/scene_tree.h" diff --git a/modules/entity_spell_system/spell_enums.h b/modules/entity_spell_system/spell_enums.h index cbafae7d4..631cfebad 100644 --- a/modules/entity_spell_system/spell_enums.h +++ b/modules/entity_spell_system/spell_enums.h @@ -27,12 +27,7 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/object/object.h" -#include "core/object/class_db.h" -#else #include "core/object.h" -#endif class SpellEnums : public Object { GDCLASS(SpellEnums, Object); diff --git a/modules/entity_spell_system/utility/entity_create_info.h b/modules/entity_spell_system/utility/entity_create_info.h index 20f8f651f..812a589e1 100644 --- a/modules/entity_spell_system/utility/entity_create_info.h +++ b/modules/entity_spell_system/utility/entity_create_info.h @@ -27,13 +27,8 @@ SOFTWARE. #include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/object/reference.h" -#include "core/string/ustring.h" -#else #include "core/reference.h" #include "core/ustring.h" -#endif #include "../entity_enums.h"