From 501f33484d0dce4240d3b36c5b5172a75b1e20c5 Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 26 Sep 2019 01:41:48 +0200 Subject: [PATCH] Removed AISpellActionContainer temporarily from the build, as it caused errors in the android build. --- SCsub | 2 +- ai/ai_spell_action_container.h | 1 + register_types.cpp | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/SCsub b/SCsub index 505a2d2..f4cd2c7 100644 --- a/SCsub +++ b/SCsub @@ -111,5 +111,5 @@ module_env.add_source_files(env.modules_sources,"loot/loot_data_item.cpp") module_env.add_source_files(env.modules_sources,"ai/ai_action.cpp") module_env.add_source_files(env.modules_sources,"ai/ai_spell_action.cpp") module_env.add_source_files(env.modules_sources,"ai/ai_action_container.cpp") -module_env.add_source_files(env.modules_sources,"ai/ai_spell_action_container.cpp") +#module_env.add_source_files(env.modules_sources,"ai/ai_spell_action_container.cpp") diff --git a/ai/ai_spell_action_container.h b/ai/ai_spell_action_container.h index 1cfcecf..770104e 100644 --- a/ai/ai_spell_action_container.h +++ b/ai/ai_spell_action_container.h @@ -1,6 +1,7 @@ #ifndef AI_SPELL_ACTION_CONTAINER_H #define AI_SPELL_ACTION_CONTAINER_H +#include "ai_action.h" #include "ai_spell_action.h" class AISpellActionContainer : public AIAction { diff --git a/register_types.cpp b/register_types.cpp index 36184a7..2050ff9 100644 --- a/register_types.cpp +++ b/register_types.cpp @@ -101,7 +101,7 @@ #include "ai/ai_action.h" #include "ai/ai_spell_action.h" #include "ai/ai_action_container.h" -#include "ai/ai_spell_action_container.h" +//#include "ai/ai_spell_action_container.h" #ifdef TOOLS_ENABLED #include "editor/editor_plugin.h" @@ -223,7 +223,7 @@ void register_entity_spell_system_types() { ClassDB::register_class(); ClassDB::register_class(); ClassDB::register_class(); - ClassDB::register_class(); + // ClassDB::register_class(); //meshes ClassDB::register_class();