Skip to content

Commit c6da4c5

Browse files
committed
Changed has_component
1 parent ced9e21 commit c6da4c5

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

WORKSPACE.bazel

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ http_archive(
2323
url = "https://github.com/ecsact-dev/ecsact_lang_cpp/archive/b1fa28b445b98d5ba62ede19cd6a5bdfa51141be.zip",
2424
)
2525

26+
http_archive(
27+
name = "ecsact_runtime",
28+
sha256 = "ab8270dfbe7fb6360e3b395fb3ad141a99d18b43bb0f3a897cf04e8a736036b8",
29+
strip_prefix = "ecsact_runtime-94b3c740e69b1bc1d35ec3dd8218e80d6bf8fa00",
30+
url = "https://github.com/ecsact-dev/ecsact_runtime/archive/94b3c740e69b1bc1d35ec3dd8218e80d6bf8fa00.zip",
31+
)
32+
2633
load("@rules_ecsact//ecsact:repositories.bzl", "ecsact_register_toolchains", "rules_ecsact_dependencies")
2734

2835
rules_ecsact_dependencies()
@@ -47,13 +54,6 @@ load("@boost//:index.bzl", "boost_http_archives")
4754

4855
boost_http_archives()
4956

50-
http_archive(
51-
name = "ecsact_runtime",
52-
sha256 = "80b722a8790447627b621877c171a96d5e7d09005bfbed7d8b388cb37cefa7b6",
53-
strip_prefix = "ecsact_runtime-f7ee18fe96c4400672caccf5475835d54281582c",
54-
url = "https://github.com/ecsact-dev/ecsact_runtime/archive/f7ee18fe96c4400672caccf5475835d54281582c.zip",
55-
)
56-
5757
http_archive(
5858
name = "hedron_compile_commands",
5959
sha256 = "4b251a482a85de6c5cb0dc34c5671e73190b9ff348e9979fa2c033d81de0f928",

ecsact/entt/runtime.hh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,8 +1092,7 @@ private:
10921092

10931093
void _apply_execution_options(
10941094
const ecsact_execution_options& options,
1095-
registry_info& info,
1096-
ecsact_registry_id reg_id
1095+
registry_info& info
10971096
) {
10981097
using boost::mp11::mp_for_each;
10991098
using ecsact::entt::detail::created_entity;
@@ -1199,7 +1198,7 @@ private:
11991198
if constexpr(C::transient) {
12001199
return;
12011200
}
1202-
if(has_component<C>(reg_id, entity)) {
1201+
if(info.registry.template all_of<C>(info.get_entt_entity_id(entity))) {
12031202
_pre_exec_remove_component<C>(
12041203
info,
12051204
info.entities_map.at(static_cast<ecsact_entity_id>(entity))
@@ -1313,7 +1312,7 @@ public:
13131312
for(int n = 0; execution_count > n; ++n) {
13141313
actions_span_t actions;
13151314
if(execution_options_list != nullptr) {
1316-
_apply_execution_options(execution_options_list[n], info, reg_id);
1315+
_apply_execution_options(execution_options_list[n], info);
13171316
if(execution_options_list->actions_length > 0) {
13181317
actions = std::span(
13191318
execution_options_list->actions,

0 commit comments

Comments
 (0)