From 4bb3fc2f2c142bd16ea7c20d3abae5038cfbf5e7 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 24 Oct 2020 10:59:22 +0200 Subject: [PATCH] Item stats panel: show items in default order (ammo, armor, health, superweapons, etc...) --- qcsrc/client/hud/panel/scoreboard.qc | 2 +- qcsrc/common/items/all.qh | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index c7adc69d4..0afb9574b 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -1387,7 +1387,7 @@ vector Scoreboard_ItemStats_Draw(vector pos, vector rgb, vector bg_size) vector tmpos = pos; int column = 0; - FOREACH(Items, true, { + IL_EACH(default_order_items, true, { int n = g_inventory.inv_items[it.m_id]; //n = 1 + floor(i * 3 + 4.8) % 7; // debug: display a value for each item if (n <= 0) continue; diff --git a/qcsrc/common/items/all.qh b/qcsrc/common/items/all.qh index 359c00179..7134a9947 100644 --- a/qcsrc/common/items/all.qh +++ b/qcsrc/common/items/all.qh @@ -12,6 +12,17 @@ REGISTRY_DEPENDS(Items, Models) REGISTER_REGISTRY(Items) #define REGISTER_ITEM(id, class) REGISTER(Items, ITEM, id, m_id, NEW(class)) +#ifdef CSQC +IntrusiveList default_order_items; +STATIC_INIT(default_order_items) +{ + default_order_items = IL_NEW(); + FOREACH(Items, true, { + IL_PUSH(default_order_items, it); + }); +} +#endif + REGISTRY_SORT(Items) REGISTRY_CHECK(Items) -- 2.39.2