From d14b8246f5f14926819d1afbdde5a377261d933d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= Date: Mon, 10 May 2021 11:58:59 +0200 Subject: [PATCH] delete entities w/o fadeout if current view isn't active --- code/game/source/world_view.c | 8 +++++++- project.4coder | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/source/world_view.c b/code/game/source/world_view.c index 952b979..3063733 100644 --- a/code/game/source/world_view.c +++ b/code/game/source/world_view.c @@ -4,11 +4,17 @@ #include "prediction.h" #include "librg.h" #include "world/world.h" +#include "game.h" int32_t tracker_read_remove(librg_world *w, librg_event *e) { int64_t entity_id = librg_event_entity_get(w, e); world_view *view = (world_view*)librg_world_userdata_get(w); - entity_view_mark_for_removal(&view->entities, entity_id); + + if (view != game_world_view_get_active()) { + entity_view_destroy(&view->entities, entity_id); + } else { + entity_view_mark_for_removal(&view->entities, entity_id); + } return 0; } diff --git a/project.4coder b/project.4coder index 65f4072..d3860aa 100644 --- a/project.4coder +++ b/project.4coder @@ -27,7 +27,7 @@ load_paths = { {{ { ".", .recursive = false, .relative = true }, - { "code/apps/client", .recursive = true, .relative = true }, + { "code/game", .recursive = true, .relative = true }, { "code/common", .recursive = true, .relative = true }, { "code/modules", .recursive = true, .relative = true }, { "code/vendors", .recursive = true, .relative = true },