From 61f61baf486f717cc802737342d2aeaad86110c5 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 15 Dec 2022 12:50:27 +0900 Subject: [PATCH] [client] Remove hud_href component I had missed this when adapting the ecs system for modular systems. --- include/client/hud.h | 1 - libs/client/hud.c | 4 ---- libs/client/sbar.c | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/client/hud.h b/include/client/hud.h index 6e84b082a..e67d1180b 100644 --- a/include/client/hud.h +++ b/include/client/hud.h @@ -31,7 +31,6 @@ struct view_s; enum { - hud_href, hud_update, hud_updateonce, hud_tile, diff --git a/libs/client/hud.c b/libs/client/hud.c index 11cc8c4aa..68ef57864 100644 --- a/libs/client/hud.c +++ b/libs/client/hud.c @@ -42,10 +42,6 @@ #include "client/hud.h" static const component_t hud_components[hud_comp_count] = { - [hud_href] = { - .size = sizeof (hierref_t), - .name = "href", - }, [hud_update] = { .size = sizeof (hud_update_f), .name = "update", diff --git a/libs/client/sbar.c b/libs/client/sbar.c index d131f2c76..9d6220d3f 100644 --- a/libs/client/sbar.c +++ b/libs/client/sbar.c @@ -2025,7 +2025,7 @@ href_cmp (const void *_a, const void *_b, void *arg) uint32_t enta = *(const uint32_t *)_a; uint32_t entb = *(const uint32_t *)_b; ecs_registry_t *reg = hud_viewsys.reg; - uint32_t href = hud_viewsys.base + hud_href; + uint32_t href = hud_viewsys.base + view_href; hierref_t *ref_a = Ent_GetComponent (enta, href, reg); hierref_t *ref_b = Ent_GetComponent (entb, href, reg); if (ref_a->hierarchy == ref_b->hierarchy) {