Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-02-20 17:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed ISSERVER and ISCLIENT macros.

Browse Source
This commit is contained in:
Relintai 2023-01-08 17:09:52 +01:00
parent 32ff660dc0
commit 01b512e263
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
entities/entity.cpp
View File

@ -45,7 +45,6 @@ SOFTWARE.
#include "core/object/script_language.h" #include "core/object/script_language.h"
#include "core/version.h" #include "core/version.h"
#include "../defines.h" #include "../defines.h"
@ -147,7 +146,7 @@ SOFTWARE.
\ \
emit_signal(signal, what, __VA_ARGS__); emit_signal(signal, what, __VA_ARGS__);
#define NOTIFICATION_AURA_DIFF_IMPLS(func, aura_func, signal, what, ...) \ #define NOTIFICATION_AURA_DIFF_IMPLS(func, aura_func, signal, what, ...) \
if (_s_entity_controller == EntityEnums::ENITIY_CONTROLLER_AI && _s_ai.is_valid()) \ if (_s_entity_controller == EntityEnums::ENITIY_CONTROLLER_AI && _s_ai.is_valid()) \
_s_ai->func(what, __VA_ARGS__); \ _s_ai->func(what, __VA_ARGS__); \
\ \
@ -156,7 +155,7 @@ SOFTWARE.
\ \
for (int i = 0; i < _s_auras.size(); ++i) { \ for (int i = 0; i < _s_auras.size(); ++i) { \
Ref<AuraData> ad = _s_auras.get(i); \ Ref<AuraData> ad = _s_auras.get(i); \
ad->get_aura()->aura_func(what, ad, __VA_ARGS__); \ ad->get_aura()->aura_func(what, ad, __VA_ARGS__); \
} \ } \
\ \
emit_signal(signal, what, __VA_ARGS__); emit_signal(signal, what, __VA_ARGS__);
@ -648,7 +647,6 @@ void Entity::setup(Ref<EntityCreateInfo> info) {
} }
if (!info->get_serialized_data().is_empty()) { if (!info->get_serialized_data().is_empty()) {
from_dict(info->get_serialized_data()); from_dict(info->get_serialized_data());
} else { } else {
sets_entity_data(info->get_entity_data()); sets_entity_data(info->get_entity_data());
@ -1355,7 +1353,6 @@ Dictionary Entity::_to_dict() {
void Entity::_from_dict(const Dictionary &dict) { void Entity::_from_dict(const Dictionary &dict) {
ERR_FAIL_COND(dict.is_empty()); ERR_FAIL_COND(dict.is_empty());
//// Transforms //// //// Transforms ////
//Not needed for now //Not needed for now
@ -1395,7 +1392,7 @@ void Entity::_from_dict(const Dictionary &dict) {
//EntityPlayerType not needed //EntityPlayerType not needed
sets_immunity_flags(dict.get("immunity_flags", 0)); sets_immunity_flags(dict.get("immunity_flags", 0));
sets_entity_flags(dict.get("entity_flags", 0)); sets_entity_flags(dict.get("entity_flags", 0));
//EntityEnums::EntityController contr = static_cast<EntityEnums::EntityController>(static_cast<int>(dict.get("entity_controller", 0))); //EntityEnums::EntityController contr = static_cast<EntityEnums::EntityController>(static_cast<int>(dict.get("entity_controller", 0)));
//sets_original_entity_controller(contr); //sets_original_entity_controller(contr);
@ -1650,7 +1647,6 @@ void Entity::_from_dict(const Dictionary &dict) {
Dictionary bagd = dict.get("bag", Dictionary()); Dictionary bagd = dict.get("bag", Dictionary());
if (!bagd.is_empty()) { if (!bagd.is_empty()) {
if (!_s_bag.is_valid()) { if (!_s_bag.is_valid()) {
Ref<Bag> bag; Ref<Bag> bag;
bag.instantiate(); bag.instantiate();
@ -4586,8 +4582,10 @@ void Entity::target_crequest_change(NodePath path) {
} }
void Entity::target_net_sets(NodePath path) { void Entity::target_net_sets(NodePath path) {
if (!ISSERVER()) Ref<MultiplayerAPI> _multiplayer_api = get_multiplayer();
if (!_multiplayer_api.is_valid() && !_multiplayer_api->is_server()) {
return; return;
}
Node *p_target = get_node_or_null(path); Node *p_target = get_node_or_null(path);
@ -5611,7 +5609,8 @@ void Entity::update(float delta) {
update_auras(delta); update_auras(delta);
if (ISSERVER()) { Ref<MultiplayerAPI> _multiplayer_api = get_multiplayer();
if (_multiplayer_api.is_valid() && _multiplayer_api->is_server()) {
if (_s_spell_cast_info.is_valid() && _s_spell_cast_info->is_casting_get()) { if (_s_spell_cast_info.is_valid() && _s_spell_cast_info->is_casting_get()) {
if (_s_spell_cast_info->update_cast_time(delta)) { if (_s_spell_cast_info->update_cast_time(delta)) {
cast_finishs(); cast_finishs();
@ -5648,7 +5647,7 @@ void Entity::update(float delta) {
} }
} }
if (ISCLIENT()) { if (_multiplayer_api.is_valid() && !_multiplayer_api->is_server()) {
if (_c_spell_cast_info.is_valid() && _c_spell_cast_info->is_casting_get()) { if (_c_spell_cast_info.is_valid() && _c_spell_cast_info->is_casting_get()) {
_c_spell_cast_info->update_cast_time(delta); _c_spell_cast_info->update_cast_time(delta);
} }
@ -6354,36 +6353,36 @@ void Entity::_notification_sdeath() {
/* /*
if dead: if dead:
return return
if starget == null: if starget == null:
queue_free() queue_free()
return return
#warning-ignore:unused_variable #warning-ignore:unused_variable
for i in range(aura_gets_count()): for i in range(aura_gets_count()):
aura_removes(aura_gets(0)) aura_removes(aura_gets(0))
dead = true dead = true
var ldiff : float = slevel - starget.slevel + 10.0 var ldiff : float = slevel - starget.slevel + 10.0
if ldiff < 0: if ldiff < 0:
ldiff = 0 ldiff = 0
if ldiff > 15: if ldiff > 15:
ldiff = 15 ldiff = 15
ldiff /= 10.0 ldiff /= 10.0
starget.xp_adds(int(5.0 * slevel * ldiff)) starget.xp_adds(int(5.0 * slevel * ldiff))
starget = null starget = null
sentity_interaction_type = EntityEnums.ENITIY_INTERACTION_TYPE_LOOT sentity_interaction_type = EntityEnums.ENITIY_INTERACTION_TYPE_LOOT
ai_state = EntityEnums.AI_STATE_OFF ai_state = EntityEnums.AI_STATE_OFF
anim_node_state_machine.travel("dead") anim_node_state_machine.travel("dead")
# set_process(false) # set_process(false)
set_physics_process(false) set_physics_process(false)
*/ */

4
entities/entity.h
View File

@ -32,6 +32,7 @@ SOFTWARE.
#include "scene/main/multiplayer_peer.h" #include "scene/main/multiplayer_peer.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/main/multiplayer_api.h"
#include "../data/items/craft_recipe.h" #include "../data/items/craft_recipe.h"
#include "../data/items/item_instance.h" #include "../data/items/item_instance.h"
@ -124,9 +125,6 @@ struct EntityStat {
} }
}; };
#define ISSERVER() (is_inside_tree() && (!get_tree()->has_network_peer() || (get_tree()->has_network_peer() && get_tree()->is_network_server())))
#define ISCLIENT() (is_inside_tree() && get_tree()->has_network_peer() && !get_tree()->is_network_server())
#define SET_RPC_OFF(p_method_name) rpc_config(p_method_name, MultiplayerAPI::RPC_MODE_DISABLED); #define SET_RPC_OFF(p_method_name) rpc_config(p_method_name, MultiplayerAPI::RPC_MODE_DISABLED);
#define SET_RPC_REMOTE(p_method_name) rpc_config(p_method_name, MultiplayerAPI::RPC_MODE_REMOTE); #define SET_RPC_REMOTE(p_method_name) rpc_config(p_method_name, MultiplayerAPI::RPC_MODE_REMOTE);
#define SET_RPC_MASTER(p_method_name) rpc_config(p_method_name, MultiplayerAPI::RPC_MODE_MASTER); #define SET_RPC_MASTER(p_method_name) rpc_config(p_method_name, MultiplayerAPI::RPC_MODE_MASTER);