From: TimePath Date: Sun, 3 May 2015 23:04:29 +0000 (+1000) Subject: #include base classes X-Git-Tag: xonotic-v0.8.1~61^2~6 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ee4a26c239e85351237b7c6b3deebe93fe372a15;p=xonotic%2Fxonotic-data.pk3dir.git #include base classes --- diff --git a/qcsrc/menu/xonotic/button.qc b/qcsrc/menu/xonotic/button.qc index 8811e952c..73518ef96 100644 --- a/qcsrc/menu/xonotic/button.qc +++ b/qcsrc/menu/xonotic/button.qc @@ -1,5 +1,6 @@ #ifndef BUTTON_H #define BUTTON_H +#include "../item/button.qc" CLASS(XonoticButton, Button) METHOD(XonoticButton, configureXonoticButton, void(entity, string, vector)) ATTRIB(XonoticButton, fontSize, float, SKINFONTSIZE_NORMAL) diff --git a/qcsrc/menu/xonotic/charmap.qc b/qcsrc/menu/xonotic/charmap.qc index 3ebf48927..d6bc52461 100644 --- a/qcsrc/menu/xonotic/charmap.qc +++ b/qcsrc/menu/xonotic/charmap.qc @@ -1,5 +1,6 @@ #ifndef CHARMAP_H #define CHARMAP_H +#include "../item.qc" CLASS(XonoticCharmap, Item) METHOD(XonoticCharmap, configureXonoticCharmap, void(entity, entity)) METHOD(XonoticCharmap, mousePress, float(entity, vector)) diff --git a/qcsrc/menu/xonotic/checkbox.qc b/qcsrc/menu/xonotic/checkbox.qc index 289824f70..65db0f5a7 100644 --- a/qcsrc/menu/xonotic/checkbox.qc +++ b/qcsrc/menu/xonotic/checkbox.qc @@ -1,5 +1,6 @@ #ifndef CHECKBOX_H #define CHECKBOX_H +#include "../item/checkbox.qc" CLASS(XonoticCheckBox, CheckBox) METHOD(XonoticCheckBox, configureXonoticCheckBox, void(entity, float, float, string, string)) METHOD(XonoticCheckBox, setChecked, void(entity, float)) diff --git a/qcsrc/menu/xonotic/checkbox_slider_invalid.qc b/qcsrc/menu/xonotic/checkbox_slider_invalid.qc index 989869c6b..9cce51d82 100644 --- a/qcsrc/menu/xonotic/checkbox_slider_invalid.qc +++ b/qcsrc/menu/xonotic/checkbox_slider_invalid.qc @@ -1,5 +1,6 @@ #ifndef CHECKBOX_SLIDER_INVALID_H #define CHECKBOX_SLIDER_INVALID_H +#include "../item/checkbox.qc" CLASS(XonoticSliderCheckBox, CheckBox) METHOD(XonoticSliderCheckBox, configureXonoticSliderCheckBox, void(entity, float, float, entity, string)) METHOD(XonoticSliderCheckBox, setChecked, void(entity, float)) diff --git a/qcsrc/menu/xonotic/checkbox_string.qc b/qcsrc/menu/xonotic/checkbox_string.qc index eefed8e6e..2efa1a102 100644 --- a/qcsrc/menu/xonotic/checkbox_string.qc +++ b/qcsrc/menu/xonotic/checkbox_string.qc @@ -1,5 +1,6 @@ #ifndef CHECKBOX_STRING_H #define CHECKBOX_STRING_H +#include "../item/checkbox.qc" CLASS(XonoticCheckBoxString, CheckBox) METHOD(XonoticCheckBoxString, configureXonoticCheckBoxString, void(entity, string, string, string, string)) METHOD(XonoticCheckBoxString, setChecked, void(entity, float)) diff --git a/qcsrc/menu/xonotic/colorbutton.qc b/qcsrc/menu/xonotic/colorbutton.qc index 952ccb70a..950661d73 100644 --- a/qcsrc/menu/xonotic/colorbutton.qc +++ b/qcsrc/menu/xonotic/colorbutton.qc @@ -1,5 +1,6 @@ #ifndef COLORBUTTON_H #define COLORBUTTON_H +#include "../item/radiobutton.qc" CLASS(XonoticColorButton, RadioButton) METHOD(XonoticColorButton, configureXonoticColorButton, void(entity, float, float, float)) METHOD(XonoticColorButton, setChecked, void(entity, float)) diff --git a/qcsrc/menu/xonotic/colorpicker.qc b/qcsrc/menu/xonotic/colorpicker.qc index c74fcf9f4..450c5fb29 100644 --- a/qcsrc/menu/xonotic/colorpicker.qc +++ b/qcsrc/menu/xonotic/colorpicker.qc @@ -1,5 +1,6 @@ #ifndef COLORPICKER_H #define COLORPICKER_H +#include "../item/image.qc" CLASS(XonoticColorpicker, Image) METHOD(XonoticColorpicker, configureXonoticColorpicker, void(entity, entity)) METHOD(XonoticColorpicker, mousePress, float(entity, vector)) diff --git a/qcsrc/menu/xonotic/colorpicker_string.qc b/qcsrc/menu/xonotic/colorpicker_string.qc index bf5e1654b..0695f057e 100644 --- a/qcsrc/menu/xonotic/colorpicker_string.qc +++ b/qcsrc/menu/xonotic/colorpicker_string.qc @@ -1,5 +1,6 @@ #ifndef COLORPICKER_STRING_H #define COLORPICKER_STRING_H +#include "../item/image.qc" CLASS(XonoticColorpickerString, Image) METHOD(XonoticColorpickerString, configureXonoticColorpickerString, void(entity, string, string)) METHOD(XonoticColorpickerString, mousePress, float(entity, vector)) diff --git a/qcsrc/menu/xonotic/commandbutton.qc b/qcsrc/menu/xonotic/commandbutton.qc index 8c1272e48..afea74cb4 100644 --- a/qcsrc/menu/xonotic/commandbutton.qc +++ b/qcsrc/menu/xonotic/commandbutton.qc @@ -6,6 +6,7 @@ #ifndef COMMANDBUTTON_H #define COMMANDBUTTON_H +#include "button.qc" CLASS(XonoticCommandButton, XonoticButton) METHOD(XonoticCommandButton, configureXonoticCommandButton, void(entity, string, vector, string, float)) ATTRIB(XonoticCommandButton, onClickCommand, string, string_null) diff --git a/qcsrc/menu/xonotic/credits.qc b/qcsrc/menu/xonotic/credits.qc index 0d04daf58..d7e17f532 100644 --- a/qcsrc/menu/xonotic/credits.qc +++ b/qcsrc/menu/xonotic/credits.qc @@ -1,5 +1,6 @@ #ifndef CREDITS_H #define CREDITS_H +#include "listbox.qc" CLASS(XonoticCreditsList, XonoticListBox) METHOD(XonoticCreditsList, configureXonoticCreditsList, void(entity)) ATTRIB(XonoticCreditsList, rowsPerItem, float, 1) diff --git a/qcsrc/menu/xonotic/crosshairbutton.qc b/qcsrc/menu/xonotic/crosshairbutton.qc index ec0d1690d..466846f12 100644 --- a/qcsrc/menu/xonotic/crosshairbutton.qc +++ b/qcsrc/menu/xonotic/crosshairbutton.qc @@ -1,5 +1,6 @@ #ifndef CROSSHAIRBUTTON_H #define CROSSHAIRBUTTON_H +#include "../item/radiobutton.qc" CLASS(XonoticCrosshairButton, RadioButton) METHOD(XonoticCrosshairButton, configureXonoticCrosshairButton, void(entity, float, float)) METHOD(XonoticCrosshairButton, setChecked, void(entity, float)) diff --git a/qcsrc/menu/xonotic/cvarlist.qc b/qcsrc/menu/xonotic/cvarlist.qc index 87f862589..44520c1f2 100644 --- a/qcsrc/menu/xonotic/cvarlist.qc +++ b/qcsrc/menu/xonotic/cvarlist.qc @@ -1,5 +1,6 @@ #ifndef CVARLIST_H #define CVARLIST_H +#include "listbox.qc" CLASS(XonoticCvarList, XonoticListBox) METHOD(XonoticCvarList, configureXonoticCvarList, void(entity)) ATTRIB(XonoticCvarList, rowsPerItem, float, 1) diff --git a/qcsrc/menu/xonotic/demolist.qc b/qcsrc/menu/xonotic/demolist.qc index fa9d60e79..4f759f68a 100644 --- a/qcsrc/menu/xonotic/demolist.qc +++ b/qcsrc/menu/xonotic/demolist.qc @@ -1,5 +1,6 @@ #ifndef DEMOLIST_H #define DEMOLIST_H +#include "listbox.qc" CLASS(XonoticDemoList, XonoticListBox) METHOD(XonoticDemoList, configureXonoticDemoList, void(entity)) ATTRIB(XonoticDemoList, rowsPerItem, float, 1) diff --git a/qcsrc/menu/xonotic/dialog.qc b/qcsrc/menu/xonotic/dialog.qc index 4901fc6a9..c1ea16c6b 100644 --- a/qcsrc/menu/xonotic/dialog.qc +++ b/qcsrc/menu/xonotic/dialog.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_H #define DIALOG_H +#include "../item/dialog.qc" CLASS(XonoticDialog, Dialog) // still to be customized by user /* diff --git a/qcsrc/menu/xonotic/dialog_credits.qc b/qcsrc/menu/xonotic/dialog_credits.qc index b87da091b..a99662663 100644 --- a/qcsrc/menu/xonotic/dialog_credits.qc +++ b/qcsrc/menu/xonotic/dialog_credits.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_CREDITS_H #define DIALOG_CREDITS_H +#include "dialog.qc" CLASS(XonoticCreditsDialog, XonoticDialog) METHOD(XonoticCreditsDialog, fill, void(entity)) METHOD(XonoticCreditsDialog, focusEnter, void(entity)) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc b/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc index 3cf01fac7..9f14754bd 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_AMMO_H #define DIALOG_HUDPANEL_AMMO_H +#include "rootdialog.qc" CLASS(XonoticHUDAmmoDialog, XonoticRootDialog) METHOD(XonoticHUDAmmoDialog, fill, void(entity)) ATTRIB(XonoticHUDAmmoDialog, title, string, _("Ammo Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_buffs.qc b/qcsrc/menu/xonotic/dialog_hudpanel_buffs.qc index adceff3a6..7733fd350 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_buffs.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_buffs.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_BUFFS_H #define DIALOG_HUDPANEL_BUFFS_H +#include "rootdialog.qc" CLASS(XonoticHUDBuffsDialog, XonoticRootDialog) METHOD(XonoticHUDBuffsDialog, fill, void(entity)) ATTRIB(XonoticHUDBuffsDialog, title, string, _("Buffs Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc b/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc index 29b2a951b..7e74cdf5e 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_CENTERPRINT_H #define DIALOG_HUDPANEL_CENTERPRINT_H +#include "rootdialog.qc" CLASS(XonoticHUDCenterprintDialog, XonoticRootDialog) METHOD(XonoticHUDCenterprintDialog, fill, void(entity)) ATTRIB(XonoticHUDCenterprintDialog, title, string, _("Centerprint Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_chat.qc b/qcsrc/menu/xonotic/dialog_hudpanel_chat.qc index f27c3c8c7..c56c312ef 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_chat.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_chat.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_CHAT_H #define DIALOG_HUDPANEL_CHAT_H +#include "rootdialog.qc" CLASS(XonoticHUDChatDialog, XonoticRootDialog) METHOD(XonoticHUDChatDialog, fill, void(entity)) ATTRIB(XonoticHUDChatDialog, title, string, _("Chat Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc b/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc index 34e9d4d61..0220ea232 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_ENGINEINFO_H #define DIALOG_HUDPANEL_ENGINEINFO_H +#include "rootdialog.qc" CLASS(XonoticHUDEngineInfoDialog, XonoticRootDialog) METHOD(XonoticHUDEngineInfoDialog, fill, void(entity)) ATTRIB(XonoticHUDEngineInfoDialog, title, string, _("Engine Info Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc index cc99b73fc..f0482bd73 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_HEALTHARMOR_H #define DIALOG_HUDPANEL_HEALTHARMOR_H +#include "rootdialog.qc" CLASS(XonoticHUDHealthArmorDialog, XonoticRootDialog) METHOD(XonoticHUDHealthArmorDialog, fill, void(entity)) ATTRIB(XonoticHUDHealthArmorDialog, title, string, _("Health/Armor Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc b/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc index 0ed8f7afb..84625df73 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_INFOMESSAGES_H #define DIALOG_HUDPANEL_INFOMESSAGES_H +#include "rootdialog.qc" CLASS(XonoticHUDInfoMessagesDialog, XonoticRootDialog) METHOD(XonoticHUDInfoMessagesDialog, fill, void(entity)) ATTRIB(XonoticHUDInfoMessagesDialog, title, string, _("Info Messages Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc b/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc index 6c654e740..9737c5480 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_MODICONS_H #define DIALOG_HUDPANEL_MODICONS_H +#include "rootdialog.qc" CLASS(XonoticHUDModIconsDialog, XonoticRootDialog) METHOD(XonoticHUDModIconsDialog, fill, void(entity)) ATTRIB(XonoticHUDModIconsDialog, title, string, _("Mod Icons Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_notification.qc b/qcsrc/menu/xonotic/dialog_hudpanel_notification.qc index 17394ffd5..d0586710c 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_notification.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_notification.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_NOTIFICATION_H #define DIALOG_HUDPANEL_NOTIFICATION_H +#include "rootdialog.qc" CLASS(XonoticHUDNotificationDialog, XonoticRootDialog) METHOD(XonoticHUDNotificationDialog, fill, void(entity)) ATTRIB(XonoticHUDNotificationDialog, title, string, _("Notification Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_physics.qc b/qcsrc/menu/xonotic/dialog_hudpanel_physics.qc index bab993a3a..606f01aaa 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_physics.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_physics.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_PHYSICS_H #define DIALOG_HUDPANEL_PHYSICS_H +#include "rootdialog.qc" CLASS(XonoticHUDPhysicsDialog, XonoticRootDialog) METHOD(XonoticHUDPhysicsDialog, fill, void(entity)) ATTRIB(XonoticHUDPhysicsDialog, title, string, _("Physics Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc index d3ed373e4..45a2049fc 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_POWERUPS_H #define DIALOG_HUDPANEL_POWERUPS_H +#include "rootdialog.qc" CLASS(XonoticHUDPowerupsDialog, XonoticRootDialog) METHOD(XonoticHUDPowerupsDialog, fill, void(entity)) ATTRIB(XonoticHUDPowerupsDialog, title, string, _("Powerups Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc index b71bd0828..4499d7c0f 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_PRESSEDKEYS_H #define DIALOG_HUDPANEL_PRESSEDKEYS_H +#include "rootdialog.qc" CLASS(XonoticHUDPressedKeysDialog, XonoticRootDialog) METHOD(XonoticHUDPressedKeysDialog, fill, void(entity)) ATTRIB(XonoticHUDPressedKeysDialog, title, string, _("Pressed Keys Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc index 70fea9961..3333a0e64 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_RACETIMER_H #define DIALOG_HUDPANEL_RACETIMER_H +#include "rootdialog.qc" CLASS(XonoticHUDRaceTimerDialog, XonoticRootDialog) METHOD(XonoticHUDRaceTimerDialog, fill, void(entity)) ATTRIB(XonoticHUDRaceTimerDialog, title, string, _("Race Timer Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_radar.qc b/qcsrc/menu/xonotic/dialog_hudpanel_radar.qc index 4f1fc4cbd..0d159b276 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_radar.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_radar.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_RADAR_H #define DIALOG_HUDPANEL_RADAR_H +#include "rootdialog.qc" CLASS(XonoticHUDRadarDialog, XonoticRootDialog) METHOD(XonoticHUDRadarDialog, fill, void(entity)) ATTRIB(XonoticHUDRadarDialog, title, string, _("Radar Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_score.qc b/qcsrc/menu/xonotic/dialog_hudpanel_score.qc index 581c3b908..690fc3b10 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_score.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_score.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_SCORE_H #define DIALOG_HUDPANEL_SCORE_H +#include "rootdialog.qc" CLASS(XonoticHUDScoreDialog, XonoticRootDialog) METHOD(XonoticHUDScoreDialog, fill, void(entity)) ATTRIB(XonoticHUDScoreDialog, title, string, _("Score Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc b/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc index 280985a5a..d140dea22 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_TIMER_H #define DIALOG_HUDPANEL_TIMER_H +#include "rootdialog.qc" CLASS(XonoticHUDTimerDialog, XonoticRootDialog) METHOD(XonoticHUDTimerDialog, fill, void(entity)) ATTRIB(XonoticHUDTimerDialog, title, string, _("Timer Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_vote.qc b/qcsrc/menu/xonotic/dialog_hudpanel_vote.qc index 2cb64c151..62d439e33 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_vote.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_vote.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_VOTE_H #define DIALOG_HUDPANEL_VOTE_H +#include "rootdialog.qc" CLASS(XonoticHUDVoteDialog, XonoticRootDialog) METHOD(XonoticHUDVoteDialog, fill, void(entity)) ATTRIB(XonoticHUDVoteDialog, title, string, _("Vote Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc index cbbeca78b..7f58e6c4a 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDPANEL_WEAPONS_H #define DIALOG_HUDPANEL_WEAPONS_H +#include "rootdialog.qc" CLASS(XonoticHUDWeaponsDialog, XonoticRootDialog) METHOD(XonoticHUDWeaponsDialog, fill, void(entity)) ATTRIB(XonoticHUDWeaponsDialog, title, string, _("Weapons Panel")) diff --git a/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc b/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc index 2d2dad3bb..f8f6b9e6e 100644 --- a/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc +++ b/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_HUDSETUP_EXIT_H #define DIALOG_HUDSETUP_EXIT_H +#include "rootdialog.qc" CLASS(XonoticHUDExitDialog, XonoticRootDialog) METHOD(XonoticHUDExitDialog, fill, void(entity)) ATTRIB(XonoticHUDExitDialog, title, string, _("Panel HUD Setup")) diff --git a/qcsrc/menu/xonotic/dialog_monstertools.qc b/qcsrc/menu/xonotic/dialog_monstertools.qc index ea9339ba5..14587e2a9 100644 --- a/qcsrc/menu/xonotic/dialog_monstertools.qc +++ b/qcsrc/menu/xonotic/dialog_monstertools.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_MONSTERTOOLS_H #define DIALOG_MONSTERTOOLS_H +#include "rootdialog.qc" CLASS(XonoticMonsterToolsDialog, XonoticRootDialog) METHOD(XonoticMonsterToolsDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls ATTRIB(XonoticMonsterToolsDialog, title, string, _("Monster Tools")) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer.qc b/qcsrc/menu/xonotic/dialog_multiplayer.qc index dda708ad9..6aedde7fd 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_MULTIPLAYER_H #define DIALOG_MULTIPLAYER_H +#include "dialog.qc" CLASS(XonoticMultiplayerDialog, XonoticDialog) METHOD(XonoticMultiplayerDialog, fill, void(entity)) ATTRIB(XonoticMultiplayerDialog, title, string, _("Multiplayer")) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc index b082ae69a..5254f5aa3 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_MULTIPLAYER_CREATE_MAPINFO_H #define DIALOG_MULTIPLAYER_CREATE_MAPINFO_H +#include "dialog.qc" CLASS(XonoticMapInfoDialog, XonoticDialog) METHOD(XonoticMapInfoDialog, fill, void(entity)) METHOD(XonoticMapInfoDialog, loadMapInfo, void(entity, float, entity)) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc index 9cdbd2c4d..449445225 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc @@ -2,6 +2,7 @@ #ifndef DIALOG_MULTIPLAYER_CREATE_MUTATORS_H #define DIALOG_MULTIPLAYER_CREATE_MUTATORS_H +#include "dialog.qc" CLASS(XonoticMutatorsDialog, XonoticDialog) METHOD(XonoticMutatorsDialog, toString, string(entity)) METHOD(XonoticMutatorsDialog, fill, void(entity)) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc index d58fdc733..2b2354c53 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc @@ -1,5 +1,6 @@ #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")) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc index 10e112840..a5ad63320 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc @@ -2,6 +2,7 @@ #ifndef DIALOG_MULTIPLAYER_JOIN_SERVERINFO_H #define DIALOG_MULTIPLAYER_JOIN_SERVERINFO_H +#include "dialog.qc" CLASS(XonoticServerInfoDialog, XonoticDialog) METHOD(XonoticServerInfoDialog, fill, void(entity)) METHOD(XonoticServerInfoDialog, loadServerInfo, void(entity, float)) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media.qc index a4e0bbc98..f6b5e02ad 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media.qc @@ -1,5 +1,6 @@ #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")) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc index 68367fc0a..8ae5ae0c3 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc @@ -1,5 +1,6 @@ #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")) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc index a00e70e00..8d410ca7d 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_MULTIPLAYER_MEDIA_DEMO_STARTCONFIRM_H #define DIALOG_MULTIPLAYER_MEDIA_DEMO_STARTCONFIRM_H +#include "dialog.qc" CLASS(XonoticDemoStartConfirmDialog, XonoticDialog) METHOD(XonoticDemoStartConfirmDialog, fill, void(entity)) ATTRIB(XonoticDemoStartConfirmDialog, title, string, _("Disconnect")) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc index 62c72b17d..fc3aa4448 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_MULTIPLAYER_MEDIA_DEMO_TIMECONFIRM_H #define DIALOG_MULTIPLAYER_MEDIA_DEMO_TIMECONFIRM_H +#include "dialog.qc" CLASS(XonoticDemoTimeConfirmDialog, XonoticDialog) METHOD(XonoticDemoTimeConfirmDialog, fill, void(entity)) ATTRIB(XonoticDemoTimeConfirmDialog, title, string, _("Disconnect")) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc index efb96cdf8..8fc33c1b8 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc @@ -1,5 +1,6 @@ #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")) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc index 797ed8116..36832a90c 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc @@ -1,5 +1,6 @@ #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") diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc index 4016e0f2a..fa63a17b0 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_MULTIPLAYER_MEDIA_SCREENSHOT_VIEWER_H #define DIALOG_MULTIPLAYER_MEDIA_SCREENSHOT_VIEWER_H +#include "dialog.qc" CLASS(XonoticScreenshotViewerDialog, XonoticDialog) METHOD(XonoticScreenshotViewerDialog, fill, void(entity)) METHOD(XonoticScreenshotViewerDialog, keyDown, float(entity, float, float, float)) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc index 4b4c94859..f9615d21c 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc @@ -1,5 +1,6 @@ #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)) diff --git a/qcsrc/menu/xonotic/dialog_quit.qc b/qcsrc/menu/xonotic/dialog_quit.qc index 128e614be..fa4cacecb 100644 --- a/qcsrc/menu/xonotic/dialog_quit.qc +++ b/qcsrc/menu/xonotic/dialog_quit.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_QUIT_H #define DIALOG_QUIT_H +#include "dialog.qc" CLASS(XonoticQuitDialog, XonoticDialog) METHOD(XonoticQuitDialog, fill, void(entity)) ATTRIB(XonoticQuitDialog, title, string, _("Quit")) diff --git a/qcsrc/menu/xonotic/dialog_sandboxtools.qc b/qcsrc/menu/xonotic/dialog_sandboxtools.qc index 2932bcd46..bcc1ea1f0 100644 --- a/qcsrc/menu/xonotic/dialog_sandboxtools.qc +++ b/qcsrc/menu/xonotic/dialog_sandboxtools.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_SANDBOXTOOLS_H #define DIALOG_SANDBOXTOOLS_H +#include "rootdialog.qc" CLASS(XonoticSandboxToolsDialog, XonoticRootDialog) METHOD(XonoticSandboxToolsDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls ATTRIB(XonoticSandboxToolsDialog, title, string, _("Sandbox Tools")) // ;) diff --git a/qcsrc/menu/xonotic/dialog_settings.qc b/qcsrc/menu/xonotic/dialog_settings.qc index 2962cc947..e17ab14e6 100644 --- a/qcsrc/menu/xonotic/dialog_settings.qc +++ b/qcsrc/menu/xonotic/dialog_settings.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_SETTINGS_H #define DIALOG_SETTINGS_H +#include "dialog.qc" CLASS(XonoticSettingsDialog, XonoticDialog) METHOD(XonoticSettingsDialog, fill, void(entity)) ATTRIB(XonoticSettingsDialog, title, string, _("Settings")) diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.qc b/qcsrc/menu/xonotic/dialog_settings_audio.qc index 88de16ff9..528d95038 100644 --- a/qcsrc/menu/xonotic/dialog_settings_audio.qc +++ b/qcsrc/menu/xonotic/dialog_settings_audio.qc @@ -1,5 +1,6 @@ #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")) diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.qc b/qcsrc/menu/xonotic/dialog_settings_effects.qc index 34dbe37b9..a49e17647 100644 --- a/qcsrc/menu/xonotic/dialog_settings_effects.qc +++ b/qcsrc/menu/xonotic/dialog_settings_effects.qc @@ -1,5 +1,6 @@ #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")) diff --git a/qcsrc/menu/xonotic/dialog_settings_game.qc b/qcsrc/menu/xonotic/dialog_settings_game.qc index 972616201..e8fd42d5d 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game.qc @@ -1,5 +1,6 @@ #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")) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc index a5ee7fe2d..bda4fadd7 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc @@ -1,5 +1,6 @@ #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)) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc index b8b1f93e5..751eaa6a6 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc @@ -1,5 +1,6 @@ #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)) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc b/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc index dcc003771..d0b460b91 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_SETTINGS_GAME_HUDCONFIRM_H #define DIALOG_SETTINGS_GAME_HUDCONFIRM_H +#include "dialog.qc" CLASS(XonoticHUDConfirmDialog, XonoticDialog) METHOD(XonoticHUDConfirmDialog, fill, void(entity)) ATTRIB(XonoticHUDConfirmDialog, title, string, _("Enter HUD editor")) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_messages.qc b/qcsrc/menu/xonotic/dialog_settings_game_messages.qc index ac2bf76e2..eccd938f4 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_messages.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.qc @@ -1,5 +1,6 @@ #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)) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.qc b/qcsrc/menu/xonotic/dialog_settings_game_model.qc index 6bdac49d3..32955ba8f 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_model.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_model.qc @@ -1,5 +1,6 @@ #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)) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_view.qc b/qcsrc/menu/xonotic/dialog_settings_game_view.qc index 6d5e82db9..4daef475a 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_view.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_view.qc @@ -1,5 +1,6 @@ #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)) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc index 148775b13..573f139a9 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc @@ -1,5 +1,6 @@ #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)) diff --git a/qcsrc/menu/xonotic/dialog_settings_input.qc b/qcsrc/menu/xonotic/dialog_settings_input.qc index 0f2262540..752aade97 100644 --- a/qcsrc/menu/xonotic/dialog_settings_input.qc +++ b/qcsrc/menu/xonotic/dialog_settings_input.qc @@ -1,5 +1,6 @@ #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")) diff --git a/qcsrc/menu/xonotic/dialog_settings_input_userbind.qc b/qcsrc/menu/xonotic/dialog_settings_input_userbind.qc index 6a0ae52bc..d6ad2e709 100644 --- a/qcsrc/menu/xonotic/dialog_settings_input_userbind.qc +++ b/qcsrc/menu/xonotic/dialog_settings_input_userbind.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_SETTINGS_INPUT_USERBIND_H #define DIALOG_SETTINGS_INPUT_USERBIND_H +#include "dialog.qc" CLASS(XonoticUserbindEditDialog, XonoticDialog) METHOD(XonoticUserbindEditDialog, loadUserBind, void(entity, string, string, string)) METHOD(XonoticUserbindEditDialog, fill, void(entity)) diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.qc b/qcsrc/menu/xonotic/dialog_settings_misc.qc index 5a4343796..95f218b0e 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc.qc +++ b/qcsrc/menu/xonotic/dialog_settings_misc.qc @@ -1,5 +1,6 @@ #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")) diff --git a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc index e1b7ba807..af75e64b9 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc +++ b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_SETTINGS_MISC_CVARS_H #define DIALOG_SETTINGS_MISC_CVARS_H +#include "dialog.qc" CLASS(XonoticCvarsDialog, XonoticDialog) METHOD(XonoticCvarsDialog, fill, void(entity)) METHOD(XonoticCvarsDialog, showNotify, void(entity)) diff --git a/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc b/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc index 20ad7fe48..2f9932159 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc +++ b/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_SETTINGS_MISC_RESET_H #define DIALOG_SETTINGS_MISC_RESET_H +#include "dialog.qc" CLASS(XonoticResetDialog, XonoticDialog) METHOD(XonoticResetDialog, fill, void(entity)) ATTRIB(XonoticResetDialog, title, string, _("Factory reset")) diff --git a/qcsrc/menu/xonotic/dialog_settings_user.qc b/qcsrc/menu/xonotic/dialog_settings_user.qc index 0e9c1585e..e9ad109c4 100644 --- a/qcsrc/menu/xonotic/dialog_settings_user.qc +++ b/qcsrc/menu/xonotic/dialog_settings_user.qc @@ -1,5 +1,6 @@ #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")) diff --git a/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc b/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc index 3d4025ae7..0a340eaff 100644 --- a/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc +++ b/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_SETTINGS_USER_LANGUAGEWARNING_H #define DIALOG_SETTINGS_USER_LANGUAGEWARNING_H +#include "dialog.qc" CLASS(XonoticLanguageWarningDialog, XonoticDialog) METHOD(XonoticLanguageWarningDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls ATTRIB(XonoticLanguageWarningDialog, title, string, _("Warning")) diff --git a/qcsrc/menu/xonotic/dialog_settings_video.qc b/qcsrc/menu/xonotic/dialog_settings_video.qc index 8dae62f51..9b77e40a6 100644 --- a/qcsrc/menu/xonotic/dialog_settings_video.qc +++ b/qcsrc/menu/xonotic/dialog_settings_video.qc @@ -1,5 +1,6 @@ #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")) diff --git a/qcsrc/menu/xonotic/dialog_singleplayer.qc b/qcsrc/menu/xonotic/dialog_singleplayer.qc index 0112f9a5b..1620349bf 100644 --- a/qcsrc/menu/xonotic/dialog_singleplayer.qc +++ b/qcsrc/menu/xonotic/dialog_singleplayer.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_SINGLEPLAYER_H #define DIALOG_SINGLEPLAYER_H +#include "dialog.qc" CLASS(XonoticSingleplayerDialog, XonoticDialog) METHOD(XonoticSingleplayerDialog, fill, void(entity)) ATTRIB(XonoticSingleplayerDialog, title, string, _("Singleplayer")) diff --git a/qcsrc/menu/xonotic/dialog_singleplayer_winner.qc b/qcsrc/menu/xonotic/dialog_singleplayer_winner.qc index b01731bde..bc9d1c4ea 100644 --- a/qcsrc/menu/xonotic/dialog_singleplayer_winner.qc +++ b/qcsrc/menu/xonotic/dialog_singleplayer_winner.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_SINGLEPLAYER_WINNER_H #define DIALOG_SINGLEPLAYER_WINNER_H +#include "dialog.qc" CLASS(XonoticWinnerDialog, XonoticDialog) METHOD(XonoticWinnerDialog, fill, void(entity)) METHOD(XonoticWinnerDialog, focusEnter, void(entity)) diff --git a/qcsrc/menu/xonotic/dialog_teamselect.qc b/qcsrc/menu/xonotic/dialog_teamselect.qc index 8486bf7a0..8ed9d7ef2 100644 --- a/qcsrc/menu/xonotic/dialog_teamselect.qc +++ b/qcsrc/menu/xonotic/dialog_teamselect.qc @@ -1,5 +1,6 @@ #ifndef DIALOG_TEAMSELECT_H #define DIALOG_TEAMSELECT_H +#include "rootdialog.qc" CLASS(XonoticTeamSelectDialog, XonoticRootDialog) METHOD(XonoticTeamSelectDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls METHOD(XonoticTeamSelectDialog, showNotify, void(entity)) diff --git a/qcsrc/menu/xonotic/gametypebutton.qc b/qcsrc/menu/xonotic/gametypebutton.qc index 408d62a32..ae202560c 100644 --- a/qcsrc/menu/xonotic/gametypebutton.qc +++ b/qcsrc/menu/xonotic/gametypebutton.qc @@ -1,5 +1,6 @@ #ifndef GAMETYPEBUTTON_H #define GAMETYPEBUTTON_H +#include "../item/radiobutton.qc" CLASS(XonoticGametypeButton, RadioButton) METHOD(XonoticGametypeButton, configureXonoticGametypeButton, void(entity, float, string, string)) METHOD(XonoticGametypeButton, setChecked, void(entity, float)) diff --git a/qcsrc/menu/xonotic/gametypelist.qc b/qcsrc/menu/xonotic/gametypelist.qc index fde605898..d8dbc8838 100644 --- a/qcsrc/menu/xonotic/gametypelist.qc +++ b/qcsrc/menu/xonotic/gametypelist.qc @@ -1,5 +1,6 @@ #ifndef GAMETYPELIST_H #define GAMETYPELIST_H +#include "listbox.qc" CLASS(XonoticGametypeList, XonoticListBox) METHOD(XonoticGametypeList, configureXonoticGametypeList, void(entity)) ATTRIB(XonoticGametypeList, rowsPerItem, float, 2) diff --git a/qcsrc/menu/xonotic/image.qc b/qcsrc/menu/xonotic/image.qc index 40ddc3384..e8f5a8269 100644 --- a/qcsrc/menu/xonotic/image.qc +++ b/qcsrc/menu/xonotic/image.qc @@ -1,5 +1,6 @@ #ifndef IMAGE_H #define IMAGE_H +#include "../item/image.qc" CLASS(XonoticImage, Image) METHOD(XonoticImage, configureXonoticImage, void(entity, string, float)) ENDCLASS(XonoticImage) diff --git a/qcsrc/menu/xonotic/inputbox.qc b/qcsrc/menu/xonotic/inputbox.qc index eb07f5d18..de1580160 100644 --- a/qcsrc/menu/xonotic/inputbox.qc +++ b/qcsrc/menu/xonotic/inputbox.qc @@ -1,5 +1,6 @@ #ifndef INPUTBOX_H #define INPUTBOX_H +#include "../item/inputbox.qc" CLASS(XonoticInputBox, InputBox) METHOD(XonoticInputBox, configureXonoticInputBox, void(entity, float, string)) METHOD(XonoticInputBox, focusLeave, void(entity)) diff --git a/qcsrc/menu/xonotic/keybinder.qc b/qcsrc/menu/xonotic/keybinder.qc index 07d4d6a1b..82d3db4e5 100644 --- a/qcsrc/menu/xonotic/keybinder.qc +++ b/qcsrc/menu/xonotic/keybinder.qc @@ -1,5 +1,6 @@ #ifndef KEYBINDER_H #define KEYBINDER_H +#include "listbox.qc" CLASS(XonoticKeyBinder, XonoticListBox) METHOD(XonoticKeyBinder, configureXonoticKeyBinder, void(entity)) ATTRIB(XonoticKeyBinder, rowsPerItem, int, 1) diff --git a/qcsrc/menu/xonotic/languagelist.qc b/qcsrc/menu/xonotic/languagelist.qc index caa83a8d3..367da94df 100644 --- a/qcsrc/menu/xonotic/languagelist.qc +++ b/qcsrc/menu/xonotic/languagelist.qc @@ -1,5 +1,6 @@ #ifndef LANGUAGELIST_H #define LANGUAGELIST_H +#include "listbox.qc" CLASS(XonoticLanguageList, XonoticListBox) METHOD(XonoticLanguageList, configureXonoticLanguageList, void(entity)) ATTRIB(XonoticLanguageList, rowsPerItem, float, 1) diff --git a/qcsrc/menu/xonotic/listbox.qc b/qcsrc/menu/xonotic/listbox.qc index 010b0d231..c4a092385 100644 --- a/qcsrc/menu/xonotic/listbox.qc +++ b/qcsrc/menu/xonotic/listbox.qc @@ -1,5 +1,6 @@ #ifndef LISTBOX_H #define LISTBOX_H +#include "../item/listbox.qc" CLASS(XonoticListBox, ListBox) METHOD(XonoticListBox, configureXonoticListBox, void(entity)) ATTRIB(XonoticListBox, fontSize, float, SKINFONTSIZE_NORMAL) diff --git a/qcsrc/menu/xonotic/mainwindow.qc b/qcsrc/menu/xonotic/mainwindow.qc index 4dc6f8610..76e71381d 100644 --- a/qcsrc/menu/xonotic/mainwindow.qc +++ b/qcsrc/menu/xonotic/mainwindow.qc @@ -1,5 +1,6 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H +#include "../item/modalcontroller.qc" CLASS(MainWindow, ModalController) METHOD(MainWindow, configureMainWindow, void(entity)) METHOD(MainWindow, draw, void(entity)) diff --git a/qcsrc/menu/xonotic/maplist.qc b/qcsrc/menu/xonotic/maplist.qc index 796ffbc37..ec9aa1f4c 100644 --- a/qcsrc/menu/xonotic/maplist.qc +++ b/qcsrc/menu/xonotic/maplist.qc @@ -1,5 +1,6 @@ #ifndef MAPLIST_H #define MAPLIST_H +#include "listbox.qc" CLASS(XonoticMapList, XonoticListBox) METHOD(XonoticMapList, configureXonoticMapList, void(entity)) ATTRIB(XonoticMapList, rowsPerItem, float, 4) diff --git a/qcsrc/menu/xonotic/nexposee.qc b/qcsrc/menu/xonotic/nexposee.qc index 00f99aea1..966b11a98 100644 --- a/qcsrc/menu/xonotic/nexposee.qc +++ b/qcsrc/menu/xonotic/nexposee.qc @@ -1,5 +1,6 @@ #ifndef NEXPOSEE_H #define NEXPOSEE_H +#include "../item/nexposee.qc" CLASS(XonoticNexposee, Nexposee) METHOD(XonoticNexposee, configureXonoticNexposee, void(entity)) METHOD(XonoticNexposee, close, void(entity)) diff --git a/qcsrc/menu/xonotic/playermodel.qc b/qcsrc/menu/xonotic/playermodel.qc index 8e0e9ecd2..760e8f93d 100644 --- a/qcsrc/menu/xonotic/playermodel.qc +++ b/qcsrc/menu/xonotic/playermodel.qc @@ -1,5 +1,6 @@ #ifndef PLAYERMODEL_H #define PLAYERMODEL_H +#include "image.qc" CLASS(XonoticPlayerModelSelector, XonoticImage) METHOD(XonoticPlayerModelSelector, configureXonoticPlayerModelSelector, void(entity)) METHOD(XonoticPlayerModelSelector, loadCvars, void(entity)) diff --git a/qcsrc/menu/xonotic/playlist.qc b/qcsrc/menu/xonotic/playlist.qc index 8d3b880cc..e912f8f08 100644 --- a/qcsrc/menu/xonotic/playlist.qc +++ b/qcsrc/menu/xonotic/playlist.qc @@ -1,5 +1,6 @@ #ifndef PLAYLIST_H #define PLAYLIST_H +#include "listbox.qc" CLASS(XonoticPlayList, XonoticListBox) METHOD(XonoticPlayList, configureXonoticPlayList, void(entity)) ATTRIB(XonoticPlayList, rowsPerItem, float, 1) diff --git a/qcsrc/menu/xonotic/radiobutton.qc b/qcsrc/menu/xonotic/radiobutton.qc index 702b1310d..05c8238d4 100644 --- a/qcsrc/menu/xonotic/radiobutton.qc +++ b/qcsrc/menu/xonotic/radiobutton.qc @@ -1,5 +1,6 @@ #ifndef RADIOBUTTON_H #define RADIOBUTTON_H +#include "../item/radiobutton.qc" CLASS(XonoticRadioButton, RadioButton) METHOD(XonoticRadioButton, configureXonoticRadioButton, void(entity, float, string, string, string)) METHOD(XonoticRadioButton, draw, void(entity)) diff --git a/qcsrc/menu/xonotic/rootdialog.qc b/qcsrc/menu/xonotic/rootdialog.qc index 24d106344..209fcade8 100644 --- a/qcsrc/menu/xonotic/rootdialog.qc +++ b/qcsrc/menu/xonotic/rootdialog.qc @@ -1,5 +1,6 @@ #ifndef ROOTDIALOG_H #define ROOTDIALOG_H +#include "dialog.qc" CLASS(XonoticRootDialog, XonoticDialog) // still to be customized by user /* diff --git a/qcsrc/menu/xonotic/screenshotimage.qc b/qcsrc/menu/xonotic/screenshotimage.qc index 4ab74aead..f2eb0b00d 100644 --- a/qcsrc/menu/xonotic/screenshotimage.qc +++ b/qcsrc/menu/xonotic/screenshotimage.qc @@ -1,5 +1,6 @@ #ifndef SCREENSHOTIMAGE_H #define SCREENSHOTIMAGE_H +#include "image.qc" CLASS(XonoticScreenshotImage, XonoticImage) METHOD(XonoticScreenshotImage, configureXonoticScreenshotImage, void(entity)) METHOD(XonoticScreenshotImage, load, void(entity, string)) diff --git a/qcsrc/menu/xonotic/screenshotlist.qc b/qcsrc/menu/xonotic/screenshotlist.qc index 41576bb04..650b3381f 100644 --- a/qcsrc/menu/xonotic/screenshotlist.qc +++ b/qcsrc/menu/xonotic/screenshotlist.qc @@ -1,5 +1,6 @@ #ifndef SCREENSHOTLIST_H #define SCREENSHOTLIST_H +#include "listbox.qc" CLASS(XonoticScreenshotList, XonoticListBox) METHOD(XonoticScreenshotList, configureXonoticScreenshotList, void(entity)) ATTRIB(XonoticScreenshotList, rowsPerItem, float, 1) diff --git a/qcsrc/menu/xonotic/serverlist.qc b/qcsrc/menu/xonotic/serverlist.qc index 2c25f4a76..3f9648be6 100644 --- a/qcsrc/menu/xonotic/serverlist.qc +++ b/qcsrc/menu/xonotic/serverlist.qc @@ -1,5 +1,6 @@ #ifndef SERVERLIST_H #define SERVERLIST_H +#include "listbox.qc" CLASS(XonoticServerList, XonoticListBox) METHOD(XonoticServerList, configureXonoticServerList, void(entity)) ATTRIB(XonoticServerList, rowsPerItem, float, 1) diff --git a/qcsrc/menu/xonotic/skinlist.qc b/qcsrc/menu/xonotic/skinlist.qc index 34733386a..936ca7baf 100644 --- a/qcsrc/menu/xonotic/skinlist.qc +++ b/qcsrc/menu/xonotic/skinlist.qc @@ -1,5 +1,6 @@ #ifndef SKINLIST_H #define SKINLIST_H +#include "listbox.qc" CLASS(XonoticSkinList, XonoticListBox) METHOD(XonoticSkinList, configureXonoticSkinList, void(entity)) ATTRIB(XonoticSkinList, rowsPerItem, float, 4) diff --git a/qcsrc/menu/xonotic/slider.qc b/qcsrc/menu/xonotic/slider.qc index 129193b12..d95cac7e9 100644 --- a/qcsrc/menu/xonotic/slider.qc +++ b/qcsrc/menu/xonotic/slider.qc @@ -1,5 +1,6 @@ #ifndef SLIDER_H #define SLIDER_H +#include "../item/slider.qc" CLASS(XonoticSlider, Slider) METHOD(XonoticSlider, configureXonoticSlider, void(entity, float, float, float, string)) METHOD(XonoticSlider, setValue, void(entity, float)) diff --git a/qcsrc/menu/xonotic/slider_decibels.qc b/qcsrc/menu/xonotic/slider_decibels.qc index 75ea83454..29d2a86ac 100644 --- a/qcsrc/menu/xonotic/slider_decibels.qc +++ b/qcsrc/menu/xonotic/slider_decibels.qc @@ -2,6 +2,7 @@ #ifndef SLIDER_DECIBELS_H #define SLIDER_DECIBELS_H +#include "slider.qc" CLASS(XonoticDecibelsSlider, XonoticSlider) METHOD(XonoticDecibelsSlider, loadCvars, void(entity)) METHOD(XonoticDecibelsSlider, saveCvars, void(entity)) diff --git a/qcsrc/menu/xonotic/slider_picmip.qc b/qcsrc/menu/xonotic/slider_picmip.qc index 14f5c61f7..f663f7dd6 100644 --- a/qcsrc/menu/xonotic/slider_picmip.qc +++ b/qcsrc/menu/xonotic/slider_picmip.qc @@ -1,5 +1,6 @@ #ifndef SLIDER_PICMIP_H #define SLIDER_PICMIP_H +#include "textslider.qc" CLASS(XonoticPicmipSlider, XonoticTextSlider) METHOD(XonoticPicmipSlider, configureXonoticPicmipSlider, void(entity)) METHOD(XonoticPicmipSlider, draw, void(entity)) diff --git a/qcsrc/menu/xonotic/slider_sbfadetime.qc b/qcsrc/menu/xonotic/slider_sbfadetime.qc index ad273ca04..4d30c64f0 100644 --- a/qcsrc/menu/xonotic/slider_sbfadetime.qc +++ b/qcsrc/menu/xonotic/slider_sbfadetime.qc @@ -1,5 +1,6 @@ #ifndef SLIDER_SBFADETIME_H #define SLIDER_SBFADETIME_H +#include "textslider.qc" CLASS(XonoticScoreboardFadeTimeSlider, XonoticTextSlider) METHOD(XonoticScoreboardFadeTimeSlider, configureXonoticScoreboardFadeTimeSlider, void(entity)) METHOD(XonoticScoreboardFadeTimeSlider, loadCvars, void(entity)) diff --git a/qcsrc/menu/xonotic/soundlist.qc b/qcsrc/menu/xonotic/soundlist.qc index ec80643b9..bba66d19d 100644 --- a/qcsrc/menu/xonotic/soundlist.qc +++ b/qcsrc/menu/xonotic/soundlist.qc @@ -1,5 +1,6 @@ #ifndef SOUNDLIST_H #define SOUNDLIST_H +#include "listbox.qc" CLASS(XonoticSoundList, XonoticListBox) METHOD(XonoticSoundList, configureXonoticSoundList, void(entity)) ATTRIB(XonoticSoundList, rowsPerItem, float, 1) diff --git a/qcsrc/menu/xonotic/statslist.qc b/qcsrc/menu/xonotic/statslist.qc index 3c5e17fe6..1cf4a688e 100644 --- a/qcsrc/menu/xonotic/statslist.qc +++ b/qcsrc/menu/xonotic/statslist.qc @@ -3,6 +3,7 @@ #ifndef STATSLIST_H #define STATSLIST_H +#include "listbox.qc" CLASS(XonoticStatsList, XonoticListBox) METHOD(XonoticStatsList, configureXonoticStatsList, void(entity)) ATTRIB(XonoticStatsList, rowsPerItem, float, 1.4) diff --git a/qcsrc/menu/xonotic/tab.qc b/qcsrc/menu/xonotic/tab.qc index a5cdf2b8f..a90e27652 100644 --- a/qcsrc/menu/xonotic/tab.qc +++ b/qcsrc/menu/xonotic/tab.qc @@ -1,5 +1,6 @@ #ifndef TAB_H #define TAB_H +#include "../item/tab.qc" CLASS(XonoticTab, Tab) // still to be customized by user /* diff --git a/qcsrc/menu/xonotic/tabcontroller.qc b/qcsrc/menu/xonotic/tabcontroller.qc index 0640171a2..c95424b17 100644 --- a/qcsrc/menu/xonotic/tabcontroller.qc +++ b/qcsrc/menu/xonotic/tabcontroller.qc @@ -1,5 +1,6 @@ #ifndef TABCONTROLLER_H #define TABCONTROLLER_H +#include "../item/modalcontroller.qc" CLASS(XonoticTabController, ModalController) METHOD(XonoticTabController, configureXonoticTabController, void(entity, float)) METHOD(XonoticTabController, makeTabButton, entity(entity, string, entity)) diff --git a/qcsrc/menu/xonotic/textlabel.qc b/qcsrc/menu/xonotic/textlabel.qc index ef180885c..e33182f2d 100644 --- a/qcsrc/menu/xonotic/textlabel.qc +++ b/qcsrc/menu/xonotic/textlabel.qc @@ -1,5 +1,6 @@ #ifndef TEXTLABEL_H #define TEXTLABEL_H +#include "../item/label.qc" CLASS(XonoticTextLabel, Label) METHOD(XonoticTextLabel, configureXonoticTextLabel, void(entity, float, string)) METHOD(XonoticTextLabel, draw, void(entity)) diff --git a/qcsrc/menu/xonotic/textslider.qc b/qcsrc/menu/xonotic/textslider.qc index 7759e203b..47d9eb44d 100644 --- a/qcsrc/menu/xonotic/textslider.qc +++ b/qcsrc/menu/xonotic/textslider.qc @@ -1,5 +1,6 @@ #ifndef TEXTSLIDER_H #define TEXTSLIDER_H +#include "../item/textslider.qc" CLASS(XonoticTextSlider, TextSlider) METHOD(XonoticTextSlider, configureXonoticTextSlider, void(entity, string)) METHOD(XonoticTextSlider, setValue, void(entity, float)) diff --git a/qcsrc/menu/xonotic/weaponarenacheckbox.qc b/qcsrc/menu/xonotic/weaponarenacheckbox.qc index d86252e13..2a8f3aa03 100644 --- a/qcsrc/menu/xonotic/weaponarenacheckbox.qc +++ b/qcsrc/menu/xonotic/weaponarenacheckbox.qc @@ -1,5 +1,6 @@ #ifndef WEAPONARENACHECKBOX_H #define WEAPONARENACHECKBOX_H +#include "../item/checkbox.qc" CLASS(XonoticWeaponarenaCheckBox, CheckBox) METHOD(XonoticWeaponarenaCheckBox, configureXonoticWeaponarenaCheckBox, void(entity, string, string)) METHOD(XonoticWeaponarenaCheckBox, setChecked, void(entity, float)) diff --git a/qcsrc/menu/xonotic/weaponslist.qc b/qcsrc/menu/xonotic/weaponslist.qc index d6eae6ec9..622505af8 100644 --- a/qcsrc/menu/xonotic/weaponslist.qc +++ b/qcsrc/menu/xonotic/weaponslist.qc @@ -1,5 +1,6 @@ #ifndef WEAPONSLIST_H #define WEAPONSLIST_H +#include "listbox.qc" CLASS(XonoticWeaponsList, XonoticListBox) METHOD(XonoticWeaponsList, configureXonoticWeaponsList, void(entity)) METHOD(XonoticWeaponsList, toString, string(entity))