From 885504c86415f07986c467d7b653da77171d853a Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 13 Oct 2019 19:39:11 +0200 Subject: [PATCH] Added the new classes to the build. Also small fixes. --- SCsub | 2 ++ data/equipment_data.cpp | 18 ++++++++---------- data/equipment_data.h | 8 ++++---- register_types.cpp | 5 +++++ 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/SCsub b/SCsub index e7e0dff..3ae7838 100644 --- a/SCsub +++ b/SCsub @@ -20,6 +20,8 @@ module_env.add_source_files(env.modules_sources,"data/item_template_stat_modifie module_env.add_source_files(env.modules_sources,"data/item_instance.cpp") module_env.add_source_files(env.modules_sources,"data/item_template.cpp") module_env.add_source_files(env.modules_sources,"data/spell_cooldown_manipulation_data.cpp") +module_env.add_source_files(env.modules_sources,"data/equipment_data.cpp") +module_env.add_source_files(env.modules_sources,"data/equipment_data_entry.cpp") module_env.add_source_files(env.modules_sources,"entities/data/entity_data.cpp") module_env.add_source_files(env.modules_sources,"entities/data/entity_class_data.cpp") diff --git a/data/equipment_data.cpp b/data/equipment_data.cpp index 4d55296..0773d80 100644 --- a/data/equipment_data.cpp +++ b/data/equipment_data.cpp @@ -1,32 +1,30 @@ #include "equipment_data.h" -Ref EquipmentDataEntry::get_slot(int index) { +Ref EquipmentData::get_slot(int index) { ERR_FAIL_INDEX_V(index, ItemEnums::EQUIP_SLOT_EQUIP_SLOT_MAX, Ref()); return _entries[index]; } -void EquipmentDataEntry::set_slot(int index, Ref entry) { +void EquipmentData::set_slot(int index, Ref entry) { ERR_FAIL_INDEX(index, ItemEnums::EQUIP_SLOT_EQUIP_SLOT_MAX); _entries[index] = entry; } -EquipmentDataEntry::EquipmentDataEntry() { +EquipmentData::EquipmentData() { } -EquipmentDataEntry::~EquipmentDataEntry() { +EquipmentData::~EquipmentData() { for (int i = 0; i < ItemEnums::EQUIP_SLOT_EQUIP_SLOT_MAX; ++i) _entries[i].unref(); } -void EquipmentDataEntry::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_slot", "index"), &EquipmentDataEntry::get_slot); - ClassDB::bind_method(D_METHOD("set_slot", "index", "entry"), &EquipmentDataEntry::set_slot); +void EquipmentData::_bind_methods() { + ClassDB::bind_method(D_METHOD("get_slot", "index"), &EquipmentData::get_slot); + ClassDB::bind_method(D_METHOD("set_slot", "index", "entry"), &EquipmentData::set_slot); ADD_GROUP("Slots", "slot"); for (int i = 0; i < ItemEnums::EQUIP_SLOT_EQUIP_SLOT_MAX; ++i) { - ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "slot_" + ItemEnums::get_equip_slot_string(i), PROPERTY_HINT_RESOURCE_TYPE, "EntityData"), "sets_entity_data", "gets_entity_data", i); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "slot_" + ItemEnums::get_equip_slot_string(i), PROPERTY_HINT_RESOURCE_TYPE, "EquipmentDataEntry"), "set_slot", "get_slot", i); } - - } diff --git a/data/equipment_data.h b/data/equipment_data.h index 611c44c..5c701c8 100644 --- a/data/equipment_data.h +++ b/data/equipment_data.h @@ -6,15 +6,15 @@ #include "../item_enums.h" #include "equipment_data_entry.h" -class EquipmentDataEntry : public Resource { - GDCLASS(EquipmentDataEntry, Resource); +class EquipmentData : public Resource { + GDCLASS(EquipmentData, Resource); public: Ref get_slot(int index); void set_slot(int index, Ref entry); - EquipmentDataEntry(); - ~EquipmentDataEntry(); + EquipmentData(); + ~EquipmentData(); protected: static void _bind_methods(); diff --git a/register_types.cpp b/register_types.cpp index acff37f..bb7d3a4 100644 --- a/register_types.cpp +++ b/register_types.cpp @@ -10,6 +10,8 @@ #include "data/item_stat_modifier.h" #include "data/item_template_stat_modifier.h" #include "data/spell_cooldown_manipulation_data.h" +#include "data/equipment_data.h" +#include "data/equipment_data_entry.h" #include "entities/data/entity_data.h" #include "entities/data/entity_class_data.h" @@ -138,6 +140,9 @@ void register_entity_spell_system_types() { ClassDB::register_class(); ClassDB::register_class(); + ClassDB::register_class(); + ClassDB::register_class(); + ClassDB::register_class(); ClassDB::register_class();