From: otta8634 <k9wolf@pm.me>
Date: Sat, 8 Feb 2025 17:25:13 +0000 (+0800)
Subject: Improve sorting of the Settings > Game list
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=69fd36cd58b7f0c6b1a3ab52285198eb9a17f022;p=xonotic%2Fxonotic-data.pk3dir.git

Improve sorting of the Settings > Game list

Did what seemed most logical: View, HUD, Crosshair, Weapons, Models, Messages, Damage text.
This is an improvement over the previous alphabetical sorting with Damage text tacked on to the end.
Additionally View is now first, which contains Field of view, so is quite important.
---

diff --git a/qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qh b/qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qh
index f480ea433..069fa9595 100644
--- a/qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qh
+++ b/qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qh
@@ -10,4 +10,3 @@ CLASS(XonoticDamageTextSettings, XonoticTab)
 	ATTRIB(XonoticDamageTextSettings, columns, float, 5);
 ENDCLASS(XonoticDamageTextSettings)
 entity makeXonoticDamageTextSettingsTab();
-REGISTER_SETTINGS(damagetext, makeXonoticDamageTextSettingsTab());
diff --git a/qcsrc/menu/gamesettings.qh b/qcsrc/menu/gamesettings.qh
index 291b55b27..8e38d2d16 100644
--- a/qcsrc/menu/gamesettings.qh
+++ b/qcsrc/menu/gamesettings.qh
@@ -1,15 +1,25 @@
 #pragma once
 
-#ifdef MENUQC
-
-#include "xonotic/tab.qh"
+#include "xonotic/dialog_settings_game_hud.qh"
+#include "xonotic/dialog_settings_game_crosshair.qh"
+#include "xonotic/dialog_settings_game_messages.qh"
+#include "xonotic/dialog_settings_game_model.qh"
+#include "xonotic/dialog_settings_game_view.qh"
+#include "xonotic/dialog_settings_game_weapons.qh"
+#include <common/mutators/mutator/damagetext/ui_damagetext.qh>
 
 REGISTRY(Settings, BITS(3))
 REGISTER_REGISTRY(Settings)
 
 REGISTRY_DEFINE_GET(Settings, NULL)
 #define REGISTER_SETTINGS(id, impl) \
-    LAZY_NEW(id, impl) \
-    REGISTER(Settings, MENU, id, m_id, NEW(Lazy, LAZY(id)))
+	LAZY_NEW(id, impl) \
+	REGISTER(Settings, MENU, id, m_id, NEW(Lazy, LAZY(id)))
 
-#endif
+REGISTER_SETTINGS(View,       makeXonoticGameViewSettingsTab());
+REGISTER_SETTINGS(HUD,        makeXonoticGameHUDSettingsTab());
+REGISTER_SETTINGS(Crosshair,  makeXonoticGameCrosshairSettingsTab());
+REGISTER_SETTINGS(Weapons,    makeXonoticGameWeaponsSettingsTab());
+REGISTER_SETTINGS(Models,     makeXonoticGameModelSettingsTab());
+REGISTER_SETTINGS(Messages,   makeXonoticGameMessageSettingsTab());
+REGISTER_SETTINGS(damagetext, makeXonoticDamageTextSettingsTab());
diff --git a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qh b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qh
index 33576a3ec..44c5d0d41 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qh
@@ -10,6 +10,3 @@ CLASS(XonoticGameCrosshairSettingsTab, XonoticTab)
 	ATTRIB(XonoticGameCrosshairSettingsTab, columns, float, 6.2);
 ENDCLASS(XonoticGameCrosshairSettingsTab)
 entity makeXonoticGameCrosshairSettingsTab();
-
-#include "../gamesettings.qh"
-REGISTER_SETTINGS(Crosshair, makeXonoticGameCrosshairSettingsTab());
diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.qh b/qcsrc/menu/xonotic/dialog_settings_game_hud.qh
index a9851dc63..a6a288d43 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_hud.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.qh
@@ -11,5 +11,3 @@ CLASS(XonoticGameHUDSettingsTab, XonoticTab)
 ENDCLASS(XonoticGameHUDSettingsTab)
 entity makeXonoticGameHUDSettingsTab();
 void HUDSetup_Start(entity me, entity btn);
-#include "../gamesettings.qh"
-REGISTER_SETTINGS(HUD, makeXonoticGameHUDSettingsTab());
diff --git a/qcsrc/menu/xonotic/dialog_settings_game_messages.qh b/qcsrc/menu/xonotic/dialog_settings_game_messages.qh
index 28a769862..c283c81db 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_messages.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.qh
@@ -11,5 +11,3 @@ CLASS(XonoticGameMessageSettingsTab, XonoticTab)
 	ATTRIB(XonoticGameMessageSettingsTab, weaponsList, entity);
 ENDCLASS(XonoticGameMessageSettingsTab)
 entity makeXonoticGameMessageSettingsTab();
-#include "../gamesettings.qh"
-REGISTER_SETTINGS(Messages, makeXonoticGameMessageSettingsTab());
diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.qh b/qcsrc/menu/xonotic/dialog_settings_game_model.qh
index c3caabee7..c5160e32a 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_model.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_model.qh
@@ -11,5 +11,3 @@ CLASS(XonoticGameModelSettingsTab, XonoticTab)
 	ATTRIB(XonoticGameModelSettingsTab, columns, float, 5);
 ENDCLASS(XonoticGameModelSettingsTab)
 entity makeXonoticGameModelSettingsTab();
-#include "../gamesettings.qh"
-REGISTER_SETTINGS(Models, makeXonoticGameModelSettingsTab());
diff --git a/qcsrc/menu/xonotic/dialog_settings_game_view.qh b/qcsrc/menu/xonotic/dialog_settings_game_view.qh
index f9d600119..4245f8e51 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_view.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_view.qh
@@ -10,5 +10,3 @@ CLASS(XonoticGameViewSettingsTab, XonoticTab)
 	ATTRIB(XonoticGameViewSettingsTab, columns, float, 6.2);
 ENDCLASS(XonoticGameViewSettingsTab)
 entity makeXonoticGameViewSettingsTab();
-#include "../gamesettings.qh"
-REGISTER_SETTINGS(View, makeXonoticGameViewSettingsTab());
diff --git a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qh b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qh
index ded41a5ab..1cf5f2d5d 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qh
@@ -11,5 +11,3 @@ CLASS(XonoticGameWeaponsSettingsTab, XonoticTab)
 	ATTRIB(XonoticGameWeaponsSettingsTab, weaponsList, entity);
 ENDCLASS(XonoticGameWeaponsSettingsTab)
 entity makeXonoticGameWeaponsSettingsTab();
-#include "../gamesettings.qh"
-REGISTER_SETTINGS(Weapons, makeXonoticGameWeaponsSettingsTab());