Merge remote-tracking branch 'origin/master' into terencehill/menu_remove_tab_title

# Conflicts:
#	qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
#	qcsrc/menu/xonotic/dialog_settings_game_hud.qc
#	qcsrc/menu/xonotic/dialog_settings_game_messages.qc
#	qcsrc/menu/xonotic/dialog_settings_game_model.qc
#	qcsrc/menu/xonotic/dialog_settings_game_view.qc
#	qcsrc/menu/xonotic/dialog_settings_game_weapons.qc

diff --cc qcsrc/menu/item/tab.qc
Simple merge

diff --cc qcsrc/menu/xonotic/dialog_multiplayer.qc
Simple merge

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_create.qc
Simple merge

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_join.qc
index 86e1624a81175472570c90feb6a6ef3147f5bd63,2b2354c5330f3f0c6cae2909e0b07655f3564a1b..a4e480e18ab4197e5f0fdd52b0ac27fcab1a1e8d
--- 1/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
--- 2/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
@@@ -1,6 -1,9 +1,8 @@@
- #ifdef INTERFACE
- CLASS(XonoticServerListTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_MULTIPLAYER_JOIN_H
+ #define DIALOG_MULTIPLAYER_JOIN_H
+ #include "tab.qc"
+ CLASS(XonoticServerListTab, XonoticTab)
        METHOD(XonoticServerListTab, fill, void(entity))
 -      ATTRIB(XonoticServerListTab, title, string, _("Join"))
        ATTRIB(XonoticServerListTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticServerListTab, rows, float, 23)
        ATTRIB(XonoticServerListTab, columns, float, 6.5)

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_media.qc
index fb52c5315b30bce67fa8150ec428e05f07d92ead,f6b5e02ad85a3865c71d22f03ac12f7dae1dc990..03ffd0f36dc361d814707081bb8b6efd18eb9890
--- 1/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
--- 2/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
@@@ -1,6 -1,9 +1,8 @@@
- #ifdef INTERFACE
- CLASS(XonoticMediaTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_MULTIPLAYER_MEDIA_H
+ #define DIALOG_MULTIPLAYER_MEDIA_H
+ #include "tab.qc"
+ CLASS(XonoticMediaTab, XonoticTab)
        METHOD(XonoticMediaTab, fill, void(entity))
 -      ATTRIB(XonoticMediaTab, title, string, _("Media"))
        ATTRIB(XonoticMediaTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMediaTab, rows, float, 23)
        ATTRIB(XonoticMediaTab, columns, float, 3)

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc
index 7a6ddf219cbfec75482a4224bf0254f1c8f31d2c,8ae5ae0c3a29094772ff1612c544140160f119b0..788aa5381bac5ca7c2ac8de7d1ae2d67d3dc7360
--- 1/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc
--- 2/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc
@@@ -1,6 -1,9 +1,8 @@@
- #ifdef INTERFACE
- CLASS(XonoticDemoBrowserTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_MULTIPLAYER_MEDIA_DEMO_H
+ #define DIALOG_MULTIPLAYER_MEDIA_DEMO_H
+ #include "tab.qc"
+ CLASS(XonoticDemoBrowserTab, XonoticTab)
        METHOD(XonoticDemoBrowserTab, fill, void(entity))
 -      ATTRIB(XonoticDemoBrowserTab, title, string, _("Demo"))
        ATTRIB(XonoticDemoBrowserTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticDemoBrowserTab, rows, float, 21)
        ATTRIB(XonoticDemoBrowserTab, columns, float, 6.5)

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc
index 5a1720a30ac6f05ef0173d5ae6993abb5197e287,8fc33c1b865acfbda89e082daa91e8aefe510772..6c0791ff7ca66833470e02386876af59b5878774
--- 1/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc
--- 2/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc
@@@ -1,6 -1,9 +1,8 @@@
- #ifdef INTERFACE
- CLASS(XonoticMusicPlayerTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_MULTIPLAYER_MEDIA_MUSICPLAYER_H
+ #define DIALOG_MULTIPLAYER_MEDIA_MUSICPLAYER_H
+ #include "tab.qc"
+ CLASS(XonoticMusicPlayerTab, XonoticTab)
        METHOD(XonoticMusicPlayerTab, fill, void(entity))
 -      ATTRIB(XonoticMusicPlayerTab, title, string, _("Music"))
        ATTRIB(XonoticMusicPlayerTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMusicPlayerTab, rows, float, 21)
        ATTRIB(XonoticMusicPlayerTab, columns, float, 6.5)

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc
index 751bf5d9e4ca9d589a2806995a70a8b34296facd,36832a90cf2d501305a3548bbe9de8b11e5eb980..c6526f2ec8db9044663a6922081d8bb41199fd40
--- 1/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc
--- 2/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc
@@@ -1,6 -1,9 +1,8 @@@
- #ifdef INTERFACE
- CLASS(XonoticScreenshotBrowserTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_MULTIPLAYER_MEDIA_SCREENSHOT_H
+ #define DIALOG_MULTIPLAYER_MEDIA_SCREENSHOT_H
+ #include "tab.qc"
+ CLASS(XonoticScreenshotBrowserTab, XonoticTab)
        METHOD(XonoticScreenshotBrowserTab, fill, void(entity))
 -      ATTRIB(XonoticScreenshotBrowserTab, title, string, "Screenshot")
        ATTRIB(XonoticScreenshotBrowserTab, intendedWidth, float, 1)
        ATTRIB(XonoticScreenshotBrowserTab, rows, float, 21)
        ATTRIB(XonoticScreenshotBrowserTab, columns, float, 6.5)

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
index 0f1062038b996c800dd9d44b55e1b24d72c75f66,f9615d21ccdde1b77b0701a7342f17f33f26649a..9faf42888e83ef6e4f84c9ea4ba8152815029a6b
--- 1/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
--- 2/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
@@@ -1,7 -1,10 +1,9 @@@
- #ifdef INTERFACE
- CLASS(XonoticProfileTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_MULTIPLAYER_PROFILE_H
+ #define DIALOG_MULTIPLAYER_PROFILE_H
+ #include "tab.qc"
+ CLASS(XonoticProfileTab, XonoticTab)
        METHOD(XonoticProfileTab, fill, void(entity))
        METHOD(XonoticProfileTab, draw, void(entity))
 -      ATTRIB(XonoticProfileTab, title, string, _("Profile"))
        ATTRIB(XonoticProfileTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticProfileTab, rows, float, 23)
        ATTRIB(XonoticProfileTab, columns, float, 6.1) // added extra .2 for center space

diff --cc qcsrc/menu/xonotic/dialog_settings_audio.qc
index 2a4aa3ea56b9624990cd97bcf8c2b72f5aee693e,528d9503893a82f1f005b99e06efd2f2fd63d03e..af8faddacecceb7a6fa9531152b26fd09a8c1bc9
--- 1/qcsrc/menu/xonotic/dialog_settings_audio.qc
--- 2/qcsrc/menu/xonotic/dialog_settings_audio.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.qc
@@@ -1,6 -1,9 +1,8 @@@
- #ifdef INTERFACE
- CLASS(XonoticAudioSettingsTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_SETTINGS_AUDIO_H
+ #define DIALOG_SETTINGS_AUDIO_H
+ #include "tab.qc"
+ CLASS(XonoticAudioSettingsTab, XonoticTab)
        METHOD(XonoticAudioSettingsTab, fill, void(entity))
 -      ATTRIB(XonoticAudioSettingsTab, title, string, _("Audio"))
        ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticAudioSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2) // added extra .2 for center space

diff --cc qcsrc/menu/xonotic/dialog_settings_effects.qc
index 9fc10167566529ba59236dca42adf18c3771e65f,a49e17647a1fbcac1082f4429e09ed6d7ea33ba0..d06465082b395303a4a1857c4982c7bb7f6258a2
--- 1/qcsrc/menu/xonotic/dialog_settings_effects.qc
--- 2/qcsrc/menu/xonotic/dialog_settings_effects.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.qc
@@@ -1,6 -1,9 +1,8 @@@
- #ifdef INTERFACE
- CLASS(XonoticEffectsSettingsTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_SETTINGS_EFFECTS_H
+ #define DIALOG_SETTINGS_EFFECTS_H
+ #include "tab.qc"
+ CLASS(XonoticEffectsSettingsTab, XonoticTab)
        METHOD(XonoticEffectsSettingsTab, fill, void(entity))
 -      ATTRIB(XonoticEffectsSettingsTab, title, string, _("Effects"))
        ATTRIB(XonoticEffectsSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticEffectsSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticEffectsSettingsTab, columns, float, 6.2) // added extra .2 for center space

diff --cc qcsrc/menu/xonotic/dialog_settings_game.qc
index 4524b5133f97459da3144c390d701d1ee5988d2e,e8fd42d5d5a1bef1d097e21f76b8277c3a1b4c29..5b14b7bdb698669a8cd0531ed77d8dedbdafb7f0
--- 1/qcsrc/menu/xonotic/dialog_settings_game.qc
--- 2/qcsrc/menu/xonotic/dialog_settings_game.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game.qc
@@@ -1,6 -1,9 +1,8 @@@
- #ifdef INTERFACE
- CLASS(XonoticGameSettingsTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_SETTINGS_GAME_H
+ #define DIALOG_SETTINGS_GAME_H
+ #include "tab.qc"
+ CLASS(XonoticGameSettingsTab, XonoticTab)
        METHOD(XonoticGameSettingsTab, fill, void(entity))
 -      ATTRIB(XonoticGameSettingsTab, title, string, _("Game"))
        ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticGameSettingsTab, columns, float, 6.5)

diff --cc qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
index 052794b0899618499b8f7498ef89877e82bfb64d,bda4fadd7a44ba00942de5b16e46fe091dc165d0..be0d60edcc3d9ca7aede010de1a0c94e33561682
--- 1/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
--- 2/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
@@@ -1,7 -1,11 +1,9 @@@
- #ifdef INTERFACE
- CLASS(XonoticGameCrosshairSettingsTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_SETTINGS_GAME_CROSSHAIR_H
+ #define DIALOG_SETTINGS_GAME_CROSSHAIR_H
+ #include "tab.qc"
+ CLASS(XonoticGameCrosshairSettingsTab, XonoticTab)
 -      //METHOD(XonoticGameCrosshairSettingsTab, toString, string(entity))
        METHOD(XonoticGameCrosshairSettingsTab, fill, void(entity))
        METHOD(XonoticGameCrosshairSettingsTab, showNotify, void(entity))
 -      ATTRIB(XonoticGameCrosshairSettingsTab, title, string, _("Crosshair"))
        ATTRIB(XonoticGameCrosshairSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameCrosshairSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameCrosshairSettingsTab, columns, float, 6.2)

diff --cc qcsrc/menu/xonotic/dialog_settings_game_hud.qc
index c934d66be324f3bf6f7a8422e5d1e67eec82fab5,751eaa6a6f71677beaba15d3c32aeda4db0ab5e1..941daa7922ecf70ac744ba5c7ffb5f4c8c4de2e5
--- 1/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
--- 2/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
@@@ -1,7 -1,11 +1,9 @@@
- #ifdef INTERFACE
- CLASS(XonoticGameHUDSettingsTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_SETTINGS_GAME_HUD_H
+ #define DIALOG_SETTINGS_GAME_HUD_H
+ #include "tab.qc"
+ CLASS(XonoticGameHUDSettingsTab, XonoticTab)
 -      //METHOD(XonoticGameHUDSettingsTab, toString, string(entity))
        METHOD(XonoticGameHUDSettingsTab, fill, void(entity))
        METHOD(XonoticGameHUDSettingsTab, showNotify, void(entity))
 -      ATTRIB(XonoticGameHUDSettingsTab, title, string, _("HUD"))
        ATTRIB(XonoticGameHUDSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameHUDSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameHUDSettingsTab, columns, float, 6.2)

diff --cc qcsrc/menu/xonotic/dialog_settings_game_messages.qc
index 276fd13cfdc9ffec693a025e982a53da54f26318,eccd938f4f60450cec5a8f4e04aa065d504d7258..d52a102d4259f812fac042856d707e434fe0faea
--- 1/qcsrc/menu/xonotic/dialog_settings_game_messages.qc
--- 2/qcsrc/menu/xonotic/dialog_settings_game_messages.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.qc
@@@ -1,7 -1,11 +1,9 @@@
- #ifdef INTERFACE
- CLASS(XonoticGameMessageSettingsTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_SETTINGS_GAME_MESSAGES_H
+ #define DIALOG_SETTINGS_GAME_MESSAGES_H
+ #include "tab.qc"
+ CLASS(XonoticGameMessageSettingsTab, XonoticTab)
 -      //METHOD(XonoticGameWeaponsSettingsTab, toString, string(entity))
        METHOD(XonoticGameMessageSettingsTab, fill, void(entity))
        METHOD(XonoticGameMessageSettingsTab, showNotify, void(entity))
 -      ATTRIB(XonoticGameMessageSettingsTab, title, string, _("Messages"))
        ATTRIB(XonoticGameMessageSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameMessageSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameMessageSettingsTab, columns, float, 6)

diff --cc qcsrc/menu/xonotic/dialog_settings_game_model.qc
index 850cb1e639202de9635cec931f9c06a12e66b2ee,32955ba8f18dc6080faeedeba39d56bc917835ce..db3e4082c99a2cf5d3ec391dc933e8924cd8e55a
--- 1/qcsrc/menu/xonotic/dialog_settings_game_model.qc
--- 2/qcsrc/menu/xonotic/dialog_settings_game_model.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_model.qc
@@@ -1,7 -1,11 +1,9 @@@
- #ifdef INTERFACE
- CLASS(XonoticGameModelSettingsTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_SETTINGS_GAME_MODEL_H
+ #define DIALOG_SETTINGS_GAME_MODEL_H
+ #include "tab.qc"
+ CLASS(XonoticGameModelSettingsTab, XonoticTab)
 -      //METHOD(XonoticGameModelSettingsTab, toString, string(entity))
        METHOD(XonoticGameModelSettingsTab, fill, void(entity))
        METHOD(XonoticGameModelSettingsTab, showNotify, void(entity))
 -      ATTRIB(XonoticGameModelSettingsTab, title, string, _("Model"))
        ATTRIB(XonoticGameModelSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameModelSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameModelSettingsTab, columns, float, 5)

diff --cc qcsrc/menu/xonotic/dialog_settings_game_view.qc
index d1f9e550be69764a2bf29aee3d220de98c70aa7d,4daef475a7db4c0cb3cd08c02a9210eda99bd7f4..40a526d56ae863e25e25de98ea47fa27b78e994f
--- 1/qcsrc/menu/xonotic/dialog_settings_game_view.qc
--- 2/qcsrc/menu/xonotic/dialog_settings_game_view.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_view.qc
@@@ -1,7 -1,11 +1,9 @@@
- #ifdef INTERFACE
- CLASS(XonoticGameViewSettingsTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_SETTINGS_GAME_VIEW_H
+ #define DIALOG_SETTINGS_GAME_VIEW_H
+ #include "tab.qc"
+ CLASS(XonoticGameViewSettingsTab, XonoticTab)
 -      //METHOD(XonoticGameCrosshairSettingsTab, toString, string(entity))
        METHOD(XonoticGameViewSettingsTab, fill, void(entity))
        METHOD(XonoticGameViewSettingsTab, showNotify, void(entity))
 -      ATTRIB(XonoticGameViewSettingsTab, title, string, _("View"))
        ATTRIB(XonoticGameViewSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameViewSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameViewSettingsTab, columns, float, 6.2)

diff --cc qcsrc/menu/xonotic/dialog_settings_game_weapons.qc
index 237b761272019522d997a3c3bc04af8a0808d60d,573f139a9adfb6fa934dedfa1c6d9e3e7778967f..c59a9620d477d7826198061fdd67190f5f70d91f
--- 1/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc
--- 2/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc
@@@ -1,7 -1,11 +1,9 @@@
- #ifdef INTERFACE
- CLASS(XonoticGameWeaponsSettingsTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_SETTINGS_GAME_WEAPONS_H
+ #define DIALOG_SETTINGS_GAME_WEAPONS_H
+ #include "tab.qc"
+ CLASS(XonoticGameWeaponsSettingsTab, XonoticTab)
 -      //METHOD(XonoticGameWeaponsSettingsTab, toString, string(entity))
        METHOD(XonoticGameWeaponsSettingsTab, fill, void(entity))
        METHOD(XonoticGameWeaponsSettingsTab, showNotify, void(entity))
 -      ATTRIB(XonoticGameWeaponsSettingsTab, title, string, _("Weapons"))
        ATTRIB(XonoticGameWeaponsSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameWeaponsSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameWeaponsSettingsTab, columns, float, 6)

diff --cc qcsrc/menu/xonotic/dialog_settings_input.qc
index f7fc31f1139479ee9e30df81943a49efe9d73aa2,752aade9757ee3272a54634349de99ec4ea24b28..f8e53c03a9fd069804bb0e9a37d8a4a2da6c9aef
--- 1/qcsrc/menu/xonotic/dialog_settings_input.qc
--- 2/qcsrc/menu/xonotic/dialog_settings_input.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_input.qc
@@@ -1,6 -1,9 +1,8 @@@
- #ifdef INTERFACE
- CLASS(XonoticInputSettingsTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_SETTINGS_INPUT_H
+ #define DIALOG_SETTINGS_INPUT_H
+ #include "tab.qc"
+ CLASS(XonoticInputSettingsTab, XonoticTab)
        METHOD(XonoticInputSettingsTab, fill, void(entity))
 -      ATTRIB(XonoticInputSettingsTab, title, string, _("Input"))
        ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticInputSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticInputSettingsTab, columns, float, 6.2) // added extra .2 for center space

diff --cc qcsrc/menu/xonotic/dialog_settings_misc.qc
index e60ca4969cfd402e23825c2f6932ee170d1b0670,95f218b0e9852e357d1a20df4b2cb2f4a2612c54..79e196170669f430519c20fe627d15c8d85fa4c9
--- 1/qcsrc/menu/xonotic/dialog_settings_misc.qc
--- 2/qcsrc/menu/xonotic/dialog_settings_misc.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.qc
@@@ -1,6 -1,9 +1,8 @@@
- #ifdef INTERFACE
- CLASS(XonoticMiscSettingsTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_SETTINGS_MISC_H
+ #define DIALOG_SETTINGS_MISC_H
+ #include "tab.qc"
+ CLASS(XonoticMiscSettingsTab, XonoticTab)
        METHOD(XonoticMiscSettingsTab, fill, void(entity))
 -      ATTRIB(XonoticMiscSettingsTab, title, string, _("Misc"))
        ATTRIB(XonoticMiscSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMiscSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticMiscSettingsTab, columns, float, 6.2)

diff --cc qcsrc/menu/xonotic/dialog_settings_user.qc
index d934f9050e980ce16927d973c7f394a65471cd68,e9ad109c417c8bc7e764779b40ccf0e75ad5f8ac..35246ae1700159de66f3dc23760cf1ce93204b48
--- 1/qcsrc/menu/xonotic/dialog_settings_user.qc
--- 2/qcsrc/menu/xonotic/dialog_settings_user.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_user.qc
@@@ -1,6 -1,9 +1,8 @@@
- #ifdef INTERFACE
- CLASS(XonoticUserSettingsTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_SETTINGS_USER_H
+ #define DIALOG_SETTINGS_USER_H
+ #include "tab.qc"
+ CLASS(XonoticUserSettingsTab, XonoticTab)
        METHOD(XonoticUserSettingsTab, fill, void(entity))
 -      ATTRIB(XonoticUserSettingsTab, title, string, _("User"))
        ATTRIB(XonoticUserSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticUserSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticUserSettingsTab, columns, float, 6)

diff --cc qcsrc/menu/xonotic/dialog_settings_video.qc
index d242666b92fd731c8c41b96709484217c17d06e9,9b77e40a64d7d50d062b1a26a3f174c38221aeae..61a93f62e2696c06ff047745363e45cbb69278db
--- 1/qcsrc/menu/xonotic/dialog_settings_video.qc
--- 2/qcsrc/menu/xonotic/dialog_settings_video.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_video.qc
@@@ -1,6 -1,9 +1,8 @@@
- #ifdef INTERFACE
- CLASS(XonoticVideoSettingsTab) EXTENDS(XonoticTab)
+ #ifndef DIALOG_SETTINGS_VIDEO_H
+ #define DIALOG_SETTINGS_VIDEO_H
+ #include "tab.qc"
+ CLASS(XonoticVideoSettingsTab, XonoticTab)
        METHOD(XonoticVideoSettingsTab, fill, void(entity))
 -      ATTRIB(XonoticVideoSettingsTab, title, string, _("Video"))
        ATTRIB(XonoticVideoSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticVideoSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticVideoSettingsTab, columns, float, 6.2) // added extra .2 for center space

diff --cc qcsrc/menu/xonotic/tab.qc
Simple merge