Sort menu classes
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 3 May 2015 22:22:35 +0000 (08:22 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 3 May 2015 22:22:35 +0000 (08:22 +1000)
133 files changed:
qcsrc/menu/anim/animation.qc
qcsrc/menu/anim/animhost.qc
qcsrc/menu/anim/easing.qc
qcsrc/menu/anim/keyframe.qc
qcsrc/menu/classes.inc
qcsrc/menu/item.qc
qcsrc/menu/item/borderimage.qc
qcsrc/menu/item/button.qc
qcsrc/menu/item/checkbox.qc
qcsrc/menu/item/container.qc
qcsrc/menu/item/dialog.qc
qcsrc/menu/item/image.qc
qcsrc/menu/item/inputbox.qc
qcsrc/menu/item/inputcontainer.qc
qcsrc/menu/item/label.qc
qcsrc/menu/item/listbox.qc
qcsrc/menu/item/modalcontroller.qc
qcsrc/menu/item/nexposee.qc
qcsrc/menu/item/radiobutton.qc
qcsrc/menu/item/slider.qc
qcsrc/menu/item/tab.qc
qcsrc/menu/item/textslider.qc
qcsrc/menu/menu.qh
qcsrc/menu/oo/base.qh
qcsrc/menu/oo/classes.qc [new file with mode: 0644]
qcsrc/menu/oo/implementation.qc [deleted file]
qcsrc/menu/oo/interface.qc [deleted file]
qcsrc/menu/progs.src
qcsrc/menu/skin.qh
qcsrc/menu/xonotic/bigbutton.qc
qcsrc/menu/xonotic/bigcommandbutton.qc
qcsrc/menu/xonotic/button.qc
qcsrc/menu/xonotic/campaign.qc
qcsrc/menu/xonotic/charmap.qc
qcsrc/menu/xonotic/checkbox.qc
qcsrc/menu/xonotic/checkbox_slider_invalid.qc
qcsrc/menu/xonotic/checkbox_string.qc
qcsrc/menu/xonotic/colorbutton.qc
qcsrc/menu/xonotic/colorpicker.qc
qcsrc/menu/xonotic/colorpicker_string.qc
qcsrc/menu/xonotic/commandbutton.qc
qcsrc/menu/xonotic/credits.qc
qcsrc/menu/xonotic/crosshairbutton.qc
qcsrc/menu/xonotic/cvarlist.qc
qcsrc/menu/xonotic/demolist.qc
qcsrc/menu/xonotic/dialog.qc
qcsrc/menu/xonotic/dialog_credits.qc
qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc
qcsrc/menu/xonotic/dialog_hudpanel_buffs.qc
qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc
qcsrc/menu/xonotic/dialog_hudpanel_chat.qc
qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc
qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc
qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc
qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc
qcsrc/menu/xonotic/dialog_hudpanel_notification.qc
qcsrc/menu/xonotic/dialog_hudpanel_physics.qc
qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc
qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc
qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc
qcsrc/menu/xonotic/dialog_hudpanel_radar.qc
qcsrc/menu/xonotic/dialog_hudpanel_score.qc
qcsrc/menu/xonotic/dialog_hudpanel_timer.qc
qcsrc/menu/xonotic/dialog_hudpanel_vote.qc
qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc
qcsrc/menu/xonotic/dialog_hudsetup_exit.qc
qcsrc/menu/xonotic/dialog_monstertools.qc
qcsrc/menu/xonotic/dialog_multiplayer.qc
qcsrc/menu/xonotic/dialog_multiplayer_create.qc
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
qcsrc/menu/xonotic/dialog_multiplayer_join.qc
qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc
qcsrc/menu/xonotic/dialog_multiplayer_media.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc
qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
qcsrc/menu/xonotic/dialog_quit.qc
qcsrc/menu/xonotic/dialog_sandboxtools.qc
qcsrc/menu/xonotic/dialog_settings.qc
qcsrc/menu/xonotic/dialog_settings_audio.qc
qcsrc/menu/xonotic/dialog_settings_effects.qc
qcsrc/menu/xonotic/dialog_settings_game.qc
qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
qcsrc/menu/xonotic/dialog_settings_game_hud.qc
qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.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
qcsrc/menu/xonotic/dialog_settings_input.qc
qcsrc/menu/xonotic/dialog_settings_input_userbind.qc
qcsrc/menu/xonotic/dialog_settings_misc.qc
qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc
qcsrc/menu/xonotic/dialog_settings_misc_reset.qc
qcsrc/menu/xonotic/dialog_settings_user.qc
qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc
qcsrc/menu/xonotic/dialog_settings_video.qc
qcsrc/menu/xonotic/dialog_singleplayer.qc
qcsrc/menu/xonotic/dialog_singleplayer_winner.qc
qcsrc/menu/xonotic/dialog_teamselect.qc
qcsrc/menu/xonotic/gametypebutton.qc
qcsrc/menu/xonotic/gametypelist.qc
qcsrc/menu/xonotic/image.qc
qcsrc/menu/xonotic/inputbox.qc
qcsrc/menu/xonotic/keybinder.qc
qcsrc/menu/xonotic/languagelist.qc
qcsrc/menu/xonotic/mainwindow.qc
qcsrc/menu/xonotic/maplist.qc
qcsrc/menu/xonotic/nexposee.qc
qcsrc/menu/xonotic/playermodel.qc
qcsrc/menu/xonotic/playlist.qc
qcsrc/menu/xonotic/radiobutton.qc
qcsrc/menu/xonotic/screenshotimage.qc
qcsrc/menu/xonotic/screenshotlist.qc
qcsrc/menu/xonotic/serverlist.qc
qcsrc/menu/xonotic/skinlist.qc
qcsrc/menu/xonotic/slider.qc
qcsrc/menu/xonotic/slider_decibels.qc
qcsrc/menu/xonotic/slider_particles.qc
qcsrc/menu/xonotic/slider_picmip.qc
qcsrc/menu/xonotic/slider_sbfadetime.qc
qcsrc/menu/xonotic/soundlist.qc
qcsrc/menu/xonotic/statslist.qc
qcsrc/menu/xonotic/tab.qc
qcsrc/menu/xonotic/tabcontroller.qc
qcsrc/menu/xonotic/textlabel.qc
qcsrc/menu/xonotic/weaponarenacheckbox.qc
qcsrc/menu/xonotic/weaponslist.qc

index d327dde..94df30b 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef ANIM_ANIMATION_H
+#define ANIM_ANIMATION_H
 void setterDummy(entity, float);
 CLASS(Animation, Object)
        METHOD(Animation, configureAnimation, void(entity, entity, void(entity, float), float, float, float, float))
index 9f45023..fb4961d 100644 (file)
@@ -1,6 +1,7 @@
 #include "../menu.qh"
 
-#ifdef INTERFACE
+#ifndef ANIM_ANIMHOST_H
+#define ANIM_ANIMHOST_H
 CLASS(AnimHost, Object)
        METHOD(AnimHost, addAnim, void(entity, entity))
        METHOD(AnimHost, removeAnim, void(entity, entity))
index fa64339..f2c3d46 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef ANIM_EASING_H
+#define ANIM_EASING_H
 entity makeHostedEasing(entity, void(entity, float), float(float, float, float, float), float, float, float);
 entity makeEasing(entity, void(entity, float), float(float, float, float, float), float, float, float, float);
 float easingLinear(float, float, float, float);
index 3a7ec55..0e194bf 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef ANIM_KEYFRAME_H
+#define ANIM_KEYFRAME_H
 CLASS(Keyframe, Animation)
        METHOD(Keyframe, addEasing, entity(entity, float, float, float(float, float, float, float)))
        METHOD(Keyframe, addAnim, void(entity, entity))
index 9b4bb4d..68b90d5 100644 (file)
-#include "anim/animhost.qc"
 #include "anim/animation.qc"
+#include "anim/animhost.qc"
 #include "anim/easing.qc"
 #include "anim/keyframe.qc"
+
 #include "item.qc"
+#include "item/borderimage.qc"
+#include "item/button.qc"
+#include "item/checkbox.qc"
 #include "item/container.qc"
-#include "item/inputcontainer.qc"
-#include "item/nexposee.qc"
-#include "item/modalcontroller.qc"
+#include "item/dialog.qc"
 #include "item/image.qc"
+#include "item/inputbox.qc"
+#include "item/inputcontainer.qc"
 #include "item/label.qc"
-#include "item/button.qc"
-#include "item/checkbox.qc"
+#include "item/listbox.qc"
+#include "item/modalcontroller.qc"
+#include "item/nexposee.qc"
 #include "item/radiobutton.qc"
-#include "item/borderimage.qc"
 #include "item/slider.qc"
-#include "item/dialog.qc"
 #include "item/tab.qc"
 #include "item/textslider.qc"
-#include "item/listbox.qc"
-#include "item/inputbox.qc"
-#include "xonotic/dialog.qc"
-#include "xonotic/tab.qc"
-#include "xonotic/mainwindow.qc"
-#include "xonotic/button.qc"
+
 #include "xonotic/bigbutton.qc"
-#include "xonotic/commandbutton.qc"
 #include "xonotic/bigcommandbutton.qc"
-#include "xonotic/textlabel.qc"
-#include "xonotic/dialog_firstrun.qc"
-#include "xonotic/dialog_teamselect.qc"
-#include "xonotic/dialog_sandboxtools.qc"
-#include "xonotic/dialog_monstertools.qc"
-#include "xonotic/dialog_settings.qc"
-#include "xonotic/dialog_settings_video.qc"
-#include "xonotic/dialog_settings_effects.qc"
-#include "xonotic/dialog_settings_audio.qc"
-#include "xonotic/dialog_settings_game.qc"
-#include "xonotic/dialog_settings_user.qc"
-#include "xonotic/dialog_settings_user_languagewarning.qc"
-#include "xonotic/dialog_settings_misc.qc"
-#include "xonotic/dialog_multiplayer.qc"
-#include "xonotic/dialog_multiplayer_profile.qc"
-#include "xonotic/tabcontroller.qc"
-#include "xonotic/slider.qc"
-#include "xonotic/slider_resolution.qc"
+#include "xonotic/button.qc"
+#include "xonotic/campaign.qc"
+#include "xonotic/charmap.qc"
 #include "xonotic/checkbox.qc"
+#include "xonotic/checkbox_slider_invalid.qc"
 #include "xonotic/checkbox_string.qc"
-#include "xonotic/weaponarenacheckbox.qc"
-#include "xonotic/radiobutton.qc"
-#include "xonotic/nexposee.qc"
-#include "xonotic/rootdialog.qc"
-#include "xonotic/textslider.qc"
 #include "xonotic/colorbutton.qc"
-#include "xonotic/dialog_multiplayer_join.qc"
-#include "xonotic/dialog_multiplayer_join_serverinfo.qc"
-#include "xonotic/playerlist.qc"
-#include "xonotic/listbox.qc"
-#include "xonotic/serverlist.qc"
-#include "xonotic/inputbox.qc"
-#include "xonotic/dialog_quit.qc"
-#include "xonotic/dialog_multiplayer_create.qc"
-#include "xonotic/dialog_multiplayer_create_mutators.qc"
-#include "xonotic/dialog_multiplayer_create_mapinfo.qc"
-#include "xonotic/gametypelist.qc"
-#include "xonotic/maplist.qc"
-#include "xonotic/skinlist.qc"
-#include "xonotic/languagelist.qc"
-#include "xonotic/image.qc"
-#include "xonotic/crosshairbutton.qc"
-#include "xonotic/playermodel.qc"
-#include "xonotic/checkbox_slider_invalid.qc"
-#include "xonotic/charmap.qc"
-#include "xonotic/keybinder.qc"
-#include "xonotic/dialog_settings_input.qc"
-#include "xonotic/dialog_settings_input_userbind.qc"
-#include "xonotic/slider_decibels.qc"
-#include "xonotic/dialog_singleplayer.qc"
-#include "xonotic/campaign.qc"
-#include "xonotic/dialog_singleplayer_winner.qc"
-#include "xonotic/dialog_credits.qc"
-#include "xonotic/credits.qc"
-#include "xonotic/dialog_settings_game_crosshair.qc"
-#include "xonotic/dialog_settings_game_hud.qc"
-#include "xonotic/dialog_settings_game_hudconfirm.qc"
-#include "xonotic/dialog_settings_game_model.qc"
-#include "xonotic/dialog_settings_game_messages.qc"
-#include "xonotic/dialog_settings_game_view.qc"
-#include "xonotic/dialog_settings_game_weapons.qc"
-#include "xonotic/weaponslist.qc"
-#include "xonotic/dialog_multiplayer_media.qc"
-#include "xonotic/dialog_multiplayer_media_demo.qc"
-#include "xonotic/dialog_multiplayer_media_demo_startconfirm.qc"
-#include "xonotic/dialog_multiplayer_media_demo_timeconfirm.qc"
-#include "xonotic/demolist.qc"
-#include "xonotic/screenshotimage.qc"
-#include "xonotic/dialog_multiplayer_media_screenshot.qc"
-#include "xonotic/dialog_multiplayer_media_screenshot_viewer.qc"
-#include "xonotic/screenshotlist.qc"
-#include "xonotic/statslist.qc"
-#include "xonotic/dialog_multiplayer_media_musicplayer.qc"
-#include "xonotic/soundlist.qc"
-#include "xonotic/playlist.qc"
 #include "xonotic/colorpicker.qc"
 #include "xonotic/colorpicker_string.qc"
+#include "xonotic/commandbutton.qc"
+#include "xonotic/credits.qc"
+#include "xonotic/crosshairbutton.qc"
 #include "xonotic/cvarlist.qc"
-#include "xonotic/dialog_settings_misc_cvars.qc"
-#include "xonotic/dialog_hudsetup_exit.qc"
-#include "xonotic/dialog_hudpanel_notification.qc"
+#include "xonotic/demolist.qc"
+#include "xonotic/dialog.qc"
+#include "xonotic/dialog_credits.qc"
+#include "xonotic/dialog_firstrun.qc"
 #include "xonotic/dialog_hudpanel_ammo.qc"
+#include "xonotic/dialog_hudpanel_buffs.qc"
+#include "xonotic/dialog_hudpanel_centerprint.qc"
+#include "xonotic/dialog_hudpanel_chat.qc"
+#include "xonotic/dialog_hudpanel_engineinfo.qc"
 #include "xonotic/dialog_hudpanel_healtharmor.qc"
+#include "xonotic/dialog_hudpanel_infomessages.qc"
+#include "xonotic/dialog_hudpanel_modicons.qc"
+#include "xonotic/dialog_hudpanel_notification.qc"
+#include "xonotic/dialog_hudpanel_physics.qc"
 #include "xonotic/dialog_hudpanel_powerups.qc"
-#include "xonotic/dialog_hudpanel_racetimer.qc"
 #include "xonotic/dialog_hudpanel_pressedkeys.qc"
+#include "xonotic/dialog_hudpanel_racetimer.qc"
 #include "xonotic/dialog_hudpanel_radar.qc"
 #include "xonotic/dialog_hudpanel_score.qc"
 #include "xonotic/dialog_hudpanel_timer.qc"
 #include "xonotic/dialog_hudpanel_vote.qc"
-#include "xonotic/dialog_hudpanel_modicons.qc"
-#include "xonotic/dialog_hudpanel_chat.qc"
-#include "xonotic/dialog_hudpanel_engineinfo.qc"
-#include "xonotic/dialog_hudpanel_infomessages.qc"
 #include "xonotic/dialog_hudpanel_weapons.qc"
-#include "xonotic/dialog_hudpanel_physics.qc"
-#include "xonotic/dialog_hudpanel_centerprint.qc"
-#include "xonotic/dialog_hudpanel_buffs.qc"
-#include "xonotic/slider_picmip.qc"
+#include "xonotic/dialog_hudsetup_exit.qc"
+#include "xonotic/dialog_monstertools.qc"
+#include "xonotic/dialog_multiplayer.qc"
+#include "xonotic/dialog_multiplayer_create.qc"
+#include "xonotic/dialog_multiplayer_create_mapinfo.qc"
+#include "xonotic/dialog_multiplayer_create_mutators.qc"
+#include "xonotic/dialog_multiplayer_join.qc"
+#include "xonotic/dialog_multiplayer_join_serverinfo.qc"
+#include "xonotic/dialog_multiplayer_media.qc"
+#include "xonotic/dialog_multiplayer_media_demo.qc"
+#include "xonotic/dialog_multiplayer_media_demo_startconfirm.qc"
+#include "xonotic/dialog_multiplayer_media_demo_timeconfirm.qc"
+#include "xonotic/dialog_multiplayer_media_musicplayer.qc"
+#include "xonotic/dialog_multiplayer_media_screenshot.qc"
+#include "xonotic/dialog_multiplayer_media_screenshot_viewer.qc"
+#include "xonotic/dialog_multiplayer_profile.qc"
+#include "xonotic/dialog_quit.qc"
+#include "xonotic/dialog_sandboxtools.qc"
+#include "xonotic/dialog_settings.qc"
+#include "xonotic/dialog_settings_audio.qc"
+#include "xonotic/dialog_settings_effects.qc"
+#include "xonotic/dialog_settings_game.qc"
+#include "xonotic/dialog_settings_game_crosshair.qc"
+#include "xonotic/dialog_settings_game_hudconfirm.qc"
+#include "xonotic/dialog_settings_game_hud.qc"
+#include "xonotic/dialog_settings_game_messages.qc"
+#include "xonotic/dialog_settings_game_model.qc"
+#include "xonotic/dialog_settings_game_view.qc"
+#include "xonotic/dialog_settings_game_weapons.qc"
+#include "xonotic/dialog_settings_input.qc"
+#include "xonotic/dialog_settings_input_userbind.qc"
+#include "xonotic/dialog_settings_misc.qc"
+#include "xonotic/dialog_settings_misc_cvars.qc"
+#include "xonotic/dialog_settings_misc_reset.qc"
+#include "xonotic/dialog_settings_user.qc"
+#include "xonotic/dialog_settings_user_languagewarning.qc"
+#include "xonotic/dialog_settings_video.qc"
+#include "xonotic/dialog_singleplayer.qc"
+#include "xonotic/dialog_singleplayer_winner.qc"
+#include "xonotic/dialog_teamselect.qc"
+#include "xonotic/gametypelist.qc"
+#include "xonotic/image.qc"
+#include "xonotic/inputbox.qc"
+#include "xonotic/keybinder.qc"
+#include "xonotic/languagelist.qc"
+#include "xonotic/listbox.qc"
+#include "xonotic/mainwindow.qc"
+#include "xonotic/maplist.qc"
+#include "xonotic/nexposee.qc"
+#include "xonotic/playerlist.qc"
+#include "xonotic/playermodel.qc"
+#include "xonotic/playlist.qc"
+#include "xonotic/radiobutton.qc"
+#include "xonotic/rootdialog.qc"
+#include "xonotic/screenshotimage.qc"
+#include "xonotic/screenshotlist.qc"
+#include "xonotic/serverlist.qc"
+#include "xonotic/skinlist.qc"
+#include "xonotic/slider.qc"
+#include "xonotic/slider_decibels.qc"
 #include "xonotic/slider_particles.qc"
+#include "xonotic/slider_picmip.qc"
+#include "xonotic/slider_resolution.qc"
 #include "xonotic/slider_sbfadetime.qc"
-#include "xonotic/dialog_settings_misc_reset.qc"
+#include "xonotic/soundlist.qc"
+#include "xonotic/statslist.qc"
+#include "xonotic/tabcontroller.qc"
+#include "xonotic/tab.qc"
+#include "xonotic/textlabel.qc"
+#include "xonotic/textslider.qc"
+#include "xonotic/weaponarenacheckbox.qc"
+#include "xonotic/weaponslist.qc"
index 73acad0..62cfa13 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef ITEM_H
+#define ITEM_H
 CLASS(Item, Object)
        METHOD(Item, draw, void(entity))
        METHOD(Item, keyDown, float(entity, float, float, float))
index 422390a..6b6f469 100644 (file)
@@ -1,4 +1,6 @@
-#ifdef INTERFACE
+#ifndef ITEM_BORDERIMAGE_H
+#define ITEM_BORDERIMAGE_H
+#include "label.qc"
 CLASS(BorderImage, Label)
        METHOD(BorderImage, configureBorderImage, void(entity, string, float, vector, string, float))
        METHOD(BorderImage, resizeNotify, void(entity, vector, vector, vector, vector))
index 44a0ada..8d17f98 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef ITEM_BUTTON_H
+#define ITEM_BUTTON_H
 CLASS(Button, Label)
        METHOD(Button, configureButton, void(entity, string, float, string))
        METHOD(Button, draw, void(entity))
index 56cf449..e220b07 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef ITEM_CHECKBOX_H
+#define ITEM_CHECKBOX_H
 void CheckBox_Click(entity me, entity other);
 CLASS(CheckBox, Button)
        METHOD(CheckBox, configureCheckBox, void(entity, string, float, string))
index b4c6fdc..a5d01bf 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef ITEM_CONTAINER_H
+#define ITEM_CONTAINER_H
 CLASS(Container, Item)
        METHOD(Container, draw, void(entity))
        METHOD(Container, keyUp, float(entity, float, float, float))
index e68a093..b6048ac 100644 (file)
@@ -13,7 +13,9 @@
 //
 // a subclass may help with using this as a tab
 
-#ifdef INTERFACE
+#ifndef ITEM_DIALOG_H
+#define ITEM_DIALOG_H
+#include "inputcontainer.qc"
 CLASS(Dialog, InputContainer)
        METHOD(Dialog, configureDialog, void(entity)) // no runtime configuration, all parameters are given in the code!
        METHOD(Dialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls
index b78b6f5..83e5d42 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef ITEM_IMAGE_H
+#define ITEM_IMAGE_H
 CLASS(Image, Item)
        METHOD(Image, configureImage, void(entity, string))
        METHOD(Image, draw, void(entity))
index bb02fda..fd6eab1 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef ITEM_INPUTBOX_H
+#define ITEM_INPUTBOX_H
 CLASS(InputBox, Label)
        METHOD(InputBox, configureInputBox, void(entity, string, float, float, string))
        METHOD(InputBox, draw, void(entity))
index 7da5693..b06e255 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef ITEM_INPUTCONTAINER_H
+#define ITEM_INPUTCONTAINER_H
 CLASS(InputContainer, Container)
        METHOD(InputContainer, keyDown, float(entity, float, float, float))
        METHOD(InputContainer, mouseMove, float(entity, vector))
index 2e91ee1..751e5c7 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef ITEM_LABEL_H
+#define ITEM_LABEL_H
 CLASS(Label, Item)
        METHOD(Label, configureLabel, void(entity, string, float, float))
        METHOD(Label, draw, void(entity))
index 4623a5f..385ed50 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef ITEM_LISTBOX_H
+#define ITEM_LISTBOX_H
 CLASS(ListBox, Item)
        METHOD(ListBox, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(ListBox, configureListBox, void(entity, float, float))
index 228f7a5..c1bc021 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef ITEM_MODALCONTROLLER_H
+#define ITEM_MODALCONTROLLER_H
 CLASS(ModalController, Container)
        METHOD(ModalController, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(ModalController, draw, void(entity))
index b0d30cb..69d54b7 100644 (file)
@@ -1,4 +1,6 @@
-#ifdef INTERFACE
+#ifndef ITEM_NEXPOSEE_H
+#define ITEM_NEXPOSEE_H
+#include "container.qc"
 CLASS(Nexposee, Container)
        METHOD(Nexposee, draw, void(entity))
        METHOD(Nexposee, keyDown, float(entity, float, float, float))
@@ -23,7 +25,6 @@ CLASS(Nexposee, Container)
 ENDCLASS(Nexposee)
 
 void ExposeeCloseButton_Click(entity button, entity other); // un-exposees the current state
-#endif
 
 // animation states:
 //   0 = thumbnails seen
@@ -31,9 +32,6 @@ void ExposeeCloseButton_Click(entity button, entity other); // un-exposees the c
 //   2 = zoomed in
 //   3 = zooming out
 // animation factor: 0 = minimum theSize, 1 = maximum theSize
-
-#ifdef IMPLEMENTATION
-
 .vector Nexposee_initialSize;
 .vector Nexposee_initialFontScale;
 .vector Nexposee_initialOrigin;
@@ -47,6 +45,9 @@ void ExposeeCloseButton_Click(entity button, entity other); // un-exposees the c
 .vector Nexposee_align;
 .float Nexposee_animationFactor;
 
+#endif
+
+#ifdef IMPLEMENTATION
 void Nexposee_close(entity me)
 {
        // user must override this
index 97168fc..d8cadea 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef ITEM_RADIOBUTTON_H
+#define ITEM_RADIOBUTTON_H
 void RadioButton_Click(entity me, entity other);
 CLASS(RadioButton, CheckBox)
        METHOD(RadioButton, configureRadioButton, void(entity, string, float, string, float, float))
index b7605e4..7ee9cef 100644 (file)
@@ -1,6 +1,7 @@
 // Note:
 //   to use this, you FIRST call configureSliderVisuals, then configureSliderValues
-#ifdef INTERFACE
+#ifndef ITEM_SLIDER_H
+#define ITEM_SLIDER_H
 CLASS(Slider, Label)
        METHOD(Slider, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(Slider, configureSliderVisuals, void(entity, float, float, float, string))
index d5796c1..3fdcccc 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef ITEM_TAB_H
+#define ITEM_TAB_H
 CLASS(Tab, Dialog)
        ATTRIB(Tab, isTabRoot, float, 0)
        ATTRIB(Tab, closable, float, 0)
index db8b552..663f33a 100644 (file)
@@ -1,6 +1,7 @@
 // Note:
 //   to use this, you FIRST call configureSliderVisuals, then multiple times addValue, then configureTextSlider
-#ifdef INTERFACE
+#ifndef ITEM_TEXTSLIDER_H
+#define ITEM_TEXTSLIDER_H
 CLASS(TextSlider, Slider)
        METHOD(TextSlider, valueToText, string(entity, float))
        METHOD(TextSlider, valueToIdentifier, string(entity, float))
index 00f6017..33d467c 100644 (file)
@@ -14,9 +14,6 @@
 
 #define localcmd cmd
 
-#define NULL (null_entity)
-#define world NULL
-
 // constants
 
 const int GAME_ISSERVER        = 1;
index a833750..60b2f8b 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef BASE_H
 #define BASE_H
 
+#define NULL (null_entity)
+#define world NULL
+
 .string classname;
 .string vtblname;
 .entity vtblbase;
diff --git a/qcsrc/menu/oo/classes.qc b/qcsrc/menu/oo/classes.qc
new file mode 100644 (file)
index 0000000..e6182ca
--- /dev/null
@@ -0,0 +1,55 @@
+#include "base.qh"
+
+#ifdef CLASS
+#undef CLASS
+#undef METHOD
+#undef ATTRIB
+#undef ATTRIBARRAY
+#undef ENDCLASS
+#undef SUPER
+#endif
+
+#define CLASS(cname, base)                                          \
+[[accumulate]] entity spawn##cname(entity this, entity basevtbl) {  \
+    this = NEW(base); basevtbl = base##_vtbl;                       \
+}
+
+#define METHOD(cname, name, prototype)                              \
+prototype cname##_##name;                                           \
+.prototype name;                                                    \
+[[accumulate]] entity spawn##cname(entity this, entity basevtbl) {  \
+    this.name = cname##_##name;                                     \
+}
+
+#define ATTRIB(cname, name, type, val)                              \
+.type name;                                                         \
+[[accumulate]] entity spawn##cname(entity this, entity basevtbl) {  \
+    this.name = val;                                                \
+}
+
+#define ATTRIBARRAY(cname, name, type, cnt)                         \
+.type name[cnt];
+
+#define ENDCLASS(cname)                                             \
+.bool instanceOf##cname;                                            \
+entity cname##_vtbl;                                                \
+[[last]] entity spawn##cname(entity this, entity basevtbl) {        \
+    this.instanceOf##cname = true;                                  \
+    this.classname = #cname;                                        \
+    if (!cname##_vtbl) cname##_vtbl = spawnVtbl(this, basevtbl);    \
+    return this;                                                    \
+}
+
+#define SUPER(cname) (cname##_vtbl.vtblbase)
+
+#ifdef IMPLEMENTATION
+#undef IMPLEMENTATION
+#endif
+
+#include "../classes.inc"
+
+#ifndef IMPLEMENTATION
+#define IMPLEMENTATION
+#endif
+
+#include "../classes.inc"
diff --git a/qcsrc/menu/oo/implementation.qc b/qcsrc/menu/oo/implementation.qc
deleted file mode 100644 (file)
index 3850db4..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef INTERFACE
-#define INTERFACE
-#endif
-
-#ifndef IMPLEMENTATION
-#define IMPLEMENTATION
-#endif
-
-#ifdef CLASS
-#undef CLASS
-#undef METHOD
-#undef ATTRIB
-#undef ATTRIBARRAY
-#undef ENDCLASS
-#undef SUPER
-#endif
-
-#define CLASS(cname, base)
-#define METHOD(cname, name, prototype)
-#define ATTRIB(cname, name, type, val)
-#define ATTRIBARRAY(cname, name, type, cnt)
-#define ENDCLASS(cname)
-#define SUPER(cname) (cname##_vtbl.vtblbase)
-
-#include "../classes.inc"
diff --git a/qcsrc/menu/oo/interface.qc b/qcsrc/menu/oo/interface.qc
deleted file mode 100644 (file)
index d78a6a5..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef INTERFACE
-#define INTERFACE
-#endif
-
-#ifdef IMPLEMENTATION
-#undef IMPLEMENTATION
-#endif
-
-#ifdef CLASS
-#undef CLASS
-#undef METHOD
-#undef ATTRIB
-#undef ATTRIBARRAY
-#undef ENDCLASS
-#undef SUPER
-#endif
-
-#define CLASS(cname, base)                                          \
-[[accumulate]] entity spawn##cname(entity this, entity basevtbl) {  \
-    this = NEW(base); basevtbl = base##_vtbl;                       \
-}
-
-#define METHOD(cname, name, prototype)                              \
-prototype cname##_##name;                                           \
-.prototype name;                                                    \
-[[accumulate]] entity spawn##cname(entity this, entity basevtbl) {  \
-    this.name = cname##_##name;                                     \
-}
-
-#define ATTRIB(cname, name, type, val)                              \
-.type name;                                                         \
-[[accumulate]] entity spawn##cname(entity this, entity basevtbl) {  \
-    this.name = val;                                                \
-}
-
-#define ATTRIBARRAY(cname, name, type, cnt)                         \
-.type name[cnt];
-
-#define ENDCLASS(cname)                                             \
-.bool instanceOf##cname;                                            \
-entity cname##_vtbl;                                                \
-[[accumulate]] entity spawn##cname(entity this, entity basevtbl) {  \
-    this.instanceOf##cname = true;                                  \
-    this.classname = #cname;                                        \
-    if (!cname##_vtbl) cname##_vtbl = spawnVtbl(this, basevtbl);    \
-    return this;                                                    \
-}
-
-#define SUPER(cname)
-
-#include "../classes.inc"
index 631b91f..abfb303 100644 (file)
@@ -4,8 +4,7 @@
 ../dpdefs/menudefs.qh
 ../dpdefs/keycodes.qh
 
-oo/interface.qc
-oo/implementation.qc
+oo/classes.qc
 
 draw.qc
 menu.qc
index 84f9029..10c81e7 100644 (file)
 #undef SKINFLOAT
 #undef SKINVECTOR
 
-#define SKINBEGIN void Skin_ApplySetting(string key, string value) { switch(key) {
-#define SKINVECTOR(name,def) case #name: SKIN##name = stov(value); break
-#define SKINFLOAT(name,def) case #name: SKIN##name = stof(value); break
+#define SKINBEGIN void Skin_ApplySetting(string key, string _value) { switch(key) {
+#define SKINVECTOR(name,def) case #name: SKIN##name = stov(_value); break
+#define SKINFLOAT(name,def) case #name: SKIN##name = stof(_value); break
 //#define SKINSTRING(name,def) case #name: break
-#define SKINSTRING(name,def) case #name: SKIN##name = strzone(value); break
+#define SKINSTRING(name,def) case #name: SKIN##name = strzone(_value); break
        // I know this leaks memory when skin is read multiple times. Screw it.
 #define SKINEND case "": break; case "//": break; default: dprint("Invalid key in skin file: ", key, "\n"); } }
 #include "skin-customizables.inc"
index 897d05d..07b6a07 100644 (file)
@@ -1,4 +1,6 @@
-#ifdef INTERFACE
+#ifndef BIGBUTTON_H
+#define BIGBUTTON_H
+#include "button.qc"
 CLASS(XonoticBigButton, XonoticButton)
        METHOD(XonoticBigButton, configureXonoticBigButton, void(entity, string, vector))
        ATTRIB(XonoticBigButton, image, string, SKINGFX_BUTTON_BIG)
index d7d2031..6798d9b 100644 (file)
@@ -1,4 +1,6 @@
-#ifdef INTERFACE
+#ifndef BIGCOMMANDBUTTON_H
+#define BIGCOMMANDBUTTON_H
+#include "commandbutton.qc"
 CLASS(XonoticBigCommandButton, XonoticCommandButton)
        METHOD(XonoticBigCommandButton, configureXonoticBigCommandButton, void(entity, string, vector, string, float))
        ATTRIB(XonoticBigCommandButton, image, string, SKINGFX_BUTTON_BIG)
index 99018cb..8811e95 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef BUTTON_H
+#define BUTTON_H
 CLASS(XonoticButton, Button)
        METHOD(XonoticButton, configureXonoticButton, void(entity, string, vector))
        ATTRIB(XonoticButton, fontSize, float, SKINFONTSIZE_NORMAL)
index 3ce8fa2..826a0b4 100644 (file)
@@ -1,6 +1,8 @@
 #include "../../common/campaign_common.qh"
 
-#ifdef INTERFACE
+#ifndef CAMPAIGN_H
+#define CAMPAIGN_H
+#include "listbox.qc"
 CLASS(XonoticCampaignList, XonoticListBox)
        METHOD(XonoticCampaignList, configureXonoticCampaignList, void(entity))
        ATTRIB(XonoticCampaignList, rowsPerItem, float, 10)
index 06e4926..3ebf489 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef CHARMAP_H
+#define CHARMAP_H
 CLASS(XonoticCharmap, Item)
        METHOD(XonoticCharmap, configureXonoticCharmap, void(entity, entity))
        METHOD(XonoticCharmap, mousePress, float(entity, vector))
index 321bf7e..289824f 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef CHECKBOX_H
+#define CHECKBOX_H
 CLASS(XonoticCheckBox, CheckBox)
        METHOD(XonoticCheckBox, configureXonoticCheckBox, void(entity, float, float, string, string))
        METHOD(XonoticCheckBox, setChecked, void(entity, float))
index 22cdf8b..989869c 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef CHECKBOX_SLIDER_INVALID_H
+#define CHECKBOX_SLIDER_INVALID_H
 CLASS(XonoticSliderCheckBox, CheckBox)
        METHOD(XonoticSliderCheckBox, configureXonoticSliderCheckBox, void(entity, float, float, entity, string))
        METHOD(XonoticSliderCheckBox, setChecked, void(entity, float))
index c36b710..eefed8e 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef CHECKBOX_STRING_H
+#define CHECKBOX_STRING_H
 CLASS(XonoticCheckBoxString, CheckBox)
        METHOD(XonoticCheckBoxString, configureXonoticCheckBoxString, void(entity, string, string, string, string))
        METHOD(XonoticCheckBoxString, setChecked, void(entity, float))
index 527c051..952ccb7 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef COLORBUTTON_H
+#define COLORBUTTON_H
 CLASS(XonoticColorButton, RadioButton)
        METHOD(XonoticColorButton, configureXonoticColorButton, void(entity, float, float, float))
        METHOD(XonoticColorButton, setChecked, void(entity, float))
index 86da883..c74fcf9 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef COLORPICKER_H
+#define COLORPICKER_H
 CLASS(XonoticColorpicker, Image)
        METHOD(XonoticColorpicker, configureXonoticColorpicker, void(entity, entity))
        METHOD(XonoticColorpicker, mousePress, float(entity, vector))
index 4a5db88..bf5e165 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef COLORPICKER_STRING_H
+#define COLORPICKER_STRING_H
 CLASS(XonoticColorpickerString, Image)
        METHOD(XonoticColorpickerString, configureXonoticColorpickerString, void(entity, string, string))
        METHOD(XonoticColorpickerString, mousePress, float(entity, vector))
index e0c17d5..8c1272e 100644 (file)
@@ -4,7 +4,8 @@
 //# define COMMANDBUTTON_REVERT 4
 #endif
 
-#ifdef INTERFACE
+#ifndef COMMANDBUTTON_H
+#define COMMANDBUTTON_H
 CLASS(XonoticCommandButton, XonoticButton)
        METHOD(XonoticCommandButton, configureXonoticCommandButton, void(entity, string, vector, string, float))
        ATTRIB(XonoticCommandButton, onClickCommand, string, string_null)
index c6f320b..0d04daf 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef CREDITS_H
+#define CREDITS_H
 CLASS(XonoticCreditsList, XonoticListBox)
        METHOD(XonoticCreditsList, configureXonoticCreditsList, void(entity))
        ATTRIB(XonoticCreditsList, rowsPerItem, float, 1)
index 4ed6352..ec0d169 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef CROSSHAIRBUTTON_H
+#define CROSSHAIRBUTTON_H
 CLASS(XonoticCrosshairButton, RadioButton)
        METHOD(XonoticCrosshairButton, configureXonoticCrosshairButton, void(entity, float, float))
        METHOD(XonoticCrosshairButton, setChecked, void(entity, float))
index a965f2c..87f8625 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef CVARLIST_H
+#define CVARLIST_H
 CLASS(XonoticCvarList, XonoticListBox)
        METHOD(XonoticCvarList, configureXonoticCvarList, void(entity))
        ATTRIB(XonoticCvarList, rowsPerItem, float, 1)
index 170a4bb..fa9d60e 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DEMOLIST_H
+#define DEMOLIST_H
 CLASS(XonoticDemoList, XonoticListBox)
        METHOD(XonoticDemoList, configureXonoticDemoList, void(entity))
        ATTRIB(XonoticDemoList, rowsPerItem, float, 1)
index 3f6f30f..4901fc6 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_H
+#define DIALOG_H
 CLASS(XonoticDialog, Dialog)
        // still to be customized by user
        /*
index ba8ddbb..b87da09 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_CREDITS_H
+#define DIALOG_CREDITS_H
 CLASS(XonoticCreditsDialog, XonoticDialog)
        METHOD(XonoticCreditsDialog, fill, void(entity))
        METHOD(XonoticCreditsDialog, focusEnter, void(entity))
index 87db1ef..3cf01fa 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_AMMO_H
+#define DIALOG_HUDPANEL_AMMO_H
 CLASS(XonoticHUDAmmoDialog, XonoticRootDialog)
        METHOD(XonoticHUDAmmoDialog, fill, void(entity))
        ATTRIB(XonoticHUDAmmoDialog, title, string, _("Ammo Panel"))
index 14193b5..adceff3 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_BUFFS_H
+#define DIALOG_HUDPANEL_BUFFS_H
 CLASS(XonoticHUDBuffsDialog, XonoticRootDialog)
        METHOD(XonoticHUDBuffsDialog, fill, void(entity))
        ATTRIB(XonoticHUDBuffsDialog, title, string, _("Buffs Panel"))
index 285754d..29b2a95 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_CENTERPRINT_H
+#define DIALOG_HUDPANEL_CENTERPRINT_H
 CLASS(XonoticHUDCenterprintDialog, XonoticRootDialog)
        METHOD(XonoticHUDCenterprintDialog, fill, void(entity))
        ATTRIB(XonoticHUDCenterprintDialog, title, string, _("Centerprint Panel"))
index dd77016..f27c3c8 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_CHAT_H
+#define DIALOG_HUDPANEL_CHAT_H
 CLASS(XonoticHUDChatDialog, XonoticRootDialog)
        METHOD(XonoticHUDChatDialog, fill, void(entity))
        ATTRIB(XonoticHUDChatDialog, title, string, _("Chat Panel"))
index ef314a4..34e9d4d 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_ENGINEINFO_H
+#define DIALOG_HUDPANEL_ENGINEINFO_H
 CLASS(XonoticHUDEngineInfoDialog, XonoticRootDialog)
        METHOD(XonoticHUDEngineInfoDialog, fill, void(entity))
        ATTRIB(XonoticHUDEngineInfoDialog, title, string, _("Engine Info Panel"))
index f5656fa..cc99b73 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_HEALTHARMOR_H
+#define DIALOG_HUDPANEL_HEALTHARMOR_H
 CLASS(XonoticHUDHealthArmorDialog, XonoticRootDialog)
        METHOD(XonoticHUDHealthArmorDialog, fill, void(entity))
        ATTRIB(XonoticHUDHealthArmorDialog, title, string, _("Health/Armor Panel"))
index e25ce9a..0ed8f7a 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_INFOMESSAGES_H
+#define DIALOG_HUDPANEL_INFOMESSAGES_H
 CLASS(XonoticHUDInfoMessagesDialog, XonoticRootDialog)
        METHOD(XonoticHUDInfoMessagesDialog, fill, void(entity))
        ATTRIB(XonoticHUDInfoMessagesDialog, title, string, _("Info Messages Panel"))
index 05e0605..6c654e7 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_MODICONS_H
+#define DIALOG_HUDPANEL_MODICONS_H
 CLASS(XonoticHUDModIconsDialog, XonoticRootDialog)
        METHOD(XonoticHUDModIconsDialog, fill, void(entity))
        ATTRIB(XonoticHUDModIconsDialog, title, string, _("Mod Icons Panel"))
index f551850..17394ff 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_NOTIFICATION_H
+#define DIALOG_HUDPANEL_NOTIFICATION_H
 CLASS(XonoticHUDNotificationDialog, XonoticRootDialog)
        METHOD(XonoticHUDNotificationDialog, fill, void(entity))
        ATTRIB(XonoticHUDNotificationDialog, title, string, _("Notification Panel"))
index f6120da..bab993a 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_PHYSICS_H
+#define DIALOG_HUDPANEL_PHYSICS_H
 CLASS(XonoticHUDPhysicsDialog, XonoticRootDialog)
        METHOD(XonoticHUDPhysicsDialog, fill, void(entity))
        ATTRIB(XonoticHUDPhysicsDialog, title, string, _("Physics Panel"))
index d972771..d3ed373 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_POWERUPS_H
+#define DIALOG_HUDPANEL_POWERUPS_H
 CLASS(XonoticHUDPowerupsDialog, XonoticRootDialog)
        METHOD(XonoticHUDPowerupsDialog, fill, void(entity))
        ATTRIB(XonoticHUDPowerupsDialog, title, string, _("Powerups Panel"))
index 0d025c9..b71bd08 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_PRESSEDKEYS_H
+#define DIALOG_HUDPANEL_PRESSEDKEYS_H
 CLASS(XonoticHUDPressedKeysDialog, XonoticRootDialog)
        METHOD(XonoticHUDPressedKeysDialog, fill, void(entity))
        ATTRIB(XonoticHUDPressedKeysDialog, title, string, _("Pressed Keys Panel"))
index 1515a33..70fea99 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_RACETIMER_H
+#define DIALOG_HUDPANEL_RACETIMER_H
 CLASS(XonoticHUDRaceTimerDialog, XonoticRootDialog)
        METHOD(XonoticHUDRaceTimerDialog, fill, void(entity))
        ATTRIB(XonoticHUDRaceTimerDialog, title, string, _("Race Timer Panel"))
index 9e3eac3..4f1fc4c 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_RADAR_H
+#define DIALOG_HUDPANEL_RADAR_H
 CLASS(XonoticHUDRadarDialog, XonoticRootDialog)
        METHOD(XonoticHUDRadarDialog, fill, void(entity))
        ATTRIB(XonoticHUDRadarDialog, title, string, _("Radar Panel"))
index 95a53da..581c3b9 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_SCORE_H
+#define DIALOG_HUDPANEL_SCORE_H
 CLASS(XonoticHUDScoreDialog, XonoticRootDialog)
        METHOD(XonoticHUDScoreDialog, fill, void(entity))
        ATTRIB(XonoticHUDScoreDialog, title, string, _("Score Panel"))
index 7b7d60b..280985a 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_TIMER_H
+#define DIALOG_HUDPANEL_TIMER_H
 CLASS(XonoticHUDTimerDialog, XonoticRootDialog)
        METHOD(XonoticHUDTimerDialog, fill, void(entity))
        ATTRIB(XonoticHUDTimerDialog, title, string, _("Timer Panel"))
index 31ba3b5..2cb64c1 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_VOTE_H
+#define DIALOG_HUDPANEL_VOTE_H
 CLASS(XonoticHUDVoteDialog, XonoticRootDialog)
        METHOD(XonoticHUDVoteDialog, fill, void(entity))
        ATTRIB(XonoticHUDVoteDialog, title, string, _("Vote Panel"))
index 4164005..cbbeca7 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDPANEL_WEAPONS_H
+#define DIALOG_HUDPANEL_WEAPONS_H
 CLASS(XonoticHUDWeaponsDialog, XonoticRootDialog)
        METHOD(XonoticHUDWeaponsDialog, fill, void(entity))
        ATTRIB(XonoticHUDWeaponsDialog, title, string, _("Weapons Panel"))
index 249855c..2d2dad3 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_HUDSETUP_EXIT_H
+#define DIALOG_HUDSETUP_EXIT_H
 CLASS(XonoticHUDExitDialog, XonoticRootDialog)
        METHOD(XonoticHUDExitDialog, fill, void(entity))
        ATTRIB(XonoticHUDExitDialog, title, string, _("Panel HUD Setup"))
index c288585..ea9339b 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_MONSTERTOOLS_H
+#define DIALOG_MONSTERTOOLS_H
 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"))
index d284041..dda708a 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_MULTIPLAYER_H
+#define DIALOG_MULTIPLAYER_H
 CLASS(XonoticMultiplayerDialog, XonoticDialog)
        METHOD(XonoticMultiplayerDialog, fill, void(entity))
        ATTRIB(XonoticMultiplayerDialog, title, string, _("Multiplayer"))
index 84ce8a1..13a8e31 100644 (file)
@@ -1,4 +1,6 @@
-#ifdef INTERFACE
+#ifndef DIALOG_MULTIPLAYER_CREATE_H
+#define DIALOG_MULTIPLAYER_CREATE_H
+#include "tab.qc"
 CLASS(XonoticServerCreateTab, XonoticTab)
        METHOD(XonoticServerCreateTab, fill, void(entity))
        METHOD(XonoticServerCreateTab, gameTypeChangeNotify, void(entity))
index ab6f428..b082ae6 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_MULTIPLAYER_CREATE_MAPINFO_H
+#define DIALOG_MULTIPLAYER_CREATE_MAPINFO_H
 CLASS(XonoticMapInfoDialog, XonoticDialog)
        METHOD(XonoticMapInfoDialog, fill, void(entity))
        METHOD(XonoticMapInfoDialog, loadMapInfo, void(entity, float, entity))
index 9ac61ec..9cdbd2c 100644 (file)
@@ -1,6 +1,7 @@
 #include "../../common/weapons/weapons.qh"
 
-#ifdef INTERFACE
+#ifndef DIALOG_MULTIPLAYER_CREATE_MUTATORS_H
+#define DIALOG_MULTIPLAYER_CREATE_MUTATORS_H
 CLASS(XonoticMutatorsDialog, XonoticDialog)
        METHOD(XonoticMutatorsDialog, toString, string(entity))
        METHOD(XonoticMutatorsDialog, fill, void(entity))
index 76b1e06..d58fdc7 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_MULTIPLAYER_JOIN_H
+#define DIALOG_MULTIPLAYER_JOIN_H
 CLASS(XonoticServerListTab, XonoticTab)
        METHOD(XonoticServerListTab, fill, void(entity))
        ATTRIB(XonoticServerListTab, title, string, _("Join"))
index 74b8df6..10e1128 100644 (file)
@@ -1,6 +1,7 @@
 #include "../../common/mapinfo.qh"
 
-#ifdef INTERFACE
+#ifndef DIALOG_MULTIPLAYER_JOIN_SERVERINFO_H
+#define DIALOG_MULTIPLAYER_JOIN_SERVERINFO_H
 CLASS(XonoticServerInfoDialog, XonoticDialog)
        METHOD(XonoticServerInfoDialog, fill, void(entity))
        METHOD(XonoticServerInfoDialog, loadServerInfo, void(entity, float))
index c17fdd7..a4e0bbc 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_MULTIPLAYER_MEDIA_H
+#define DIALOG_MULTIPLAYER_MEDIA_H
 CLASS(XonoticMediaTab, XonoticTab)
        METHOD(XonoticMediaTab, fill, void(entity))
        ATTRIB(XonoticMediaTab, title, string, _("Media"))
index e79885e..68367fc 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_MULTIPLAYER_MEDIA_DEMO_H
+#define DIALOG_MULTIPLAYER_MEDIA_DEMO_H
 CLASS(XonoticDemoBrowserTab, XonoticTab)
        METHOD(XonoticDemoBrowserTab, fill, void(entity))
        ATTRIB(XonoticDemoBrowserTab, title, string, _("Demo"))
@@ -9,14 +10,11 @@ CLASS(XonoticDemoBrowserTab, XonoticTab)
        ATTRIB(XonoticDemoBrowserTab, democlicktype, float, 0)
 ENDCLASS(XonoticDemoBrowserTab)
 entity makeXonoticDemoBrowserTab();
-#ifdef IMPLEMENTATION
-// private:
-const float DMO_PLAY = 1;
-const float DMO_TIME = 2;
-#endif
 #endif
 
 #ifdef IMPLEMENTATION
+const float DMO_PLAY = 1;
+const float DMO_TIME = 2;
 void DemoConfirm_Check_Gamestatus(entity btn, entity me)
 {
        if(!(gamestatus & (GAME_CONNECTED | GAME_ISSERVER))) // we're not in a match, lets watch the demo
index 7fa2072..a00e70e 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_MULTIPLAYER_MEDIA_DEMO_STARTCONFIRM_H
+#define DIALOG_MULTIPLAYER_MEDIA_DEMO_STARTCONFIRM_H
 CLASS(XonoticDemoStartConfirmDialog, XonoticDialog)
        METHOD(XonoticDemoStartConfirmDialog, fill, void(entity))
        ATTRIB(XonoticDemoStartConfirmDialog, title, string, _("Disconnect"))
index d71ad6f..62c72b1 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_MULTIPLAYER_MEDIA_DEMO_TIMECONFIRM_H
+#define DIALOG_MULTIPLAYER_MEDIA_DEMO_TIMECONFIRM_H
 CLASS(XonoticDemoTimeConfirmDialog, XonoticDialog)
        METHOD(XonoticDemoTimeConfirmDialog, fill, void(entity))
        ATTRIB(XonoticDemoTimeConfirmDialog, title, string, _("Disconnect"))
index ddb83e0..efb96cd 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_MULTIPLAYER_MEDIA_MUSICPLAYER_H
+#define DIALOG_MULTIPLAYER_MEDIA_MUSICPLAYER_H
 CLASS(XonoticMusicPlayerTab, XonoticTab)
        METHOD(XonoticMusicPlayerTab, fill, void(entity))
        ATTRIB(XonoticMusicPlayerTab, title, string, _("Music"))
index f072645..797ed81 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_MULTIPLAYER_MEDIA_SCREENSHOT_H
+#define DIALOG_MULTIPLAYER_MEDIA_SCREENSHOT_H
 CLASS(XonoticScreenshotBrowserTab, XonoticTab)
        METHOD(XonoticScreenshotBrowserTab, fill, void(entity))
        ATTRIB(XonoticScreenshotBrowserTab, title, string, "Screenshot")
index dd47da8..4016e0f 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_MULTIPLAYER_MEDIA_SCREENSHOT_VIEWER_H
+#define DIALOG_MULTIPLAYER_MEDIA_SCREENSHOT_VIEWER_H
 CLASS(XonoticScreenshotViewerDialog, XonoticDialog)
        METHOD(XonoticScreenshotViewerDialog, fill, void(entity))
        METHOD(XonoticScreenshotViewerDialog, keyDown, float(entity, float, float, float))
index 8c6fc80..4b4c948 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_MULTIPLAYER_PROFILE_H
+#define DIALOG_MULTIPLAYER_PROFILE_H
 CLASS(XonoticProfileTab, XonoticTab)
        METHOD(XonoticProfileTab, fill, void(entity))
        METHOD(XonoticProfileTab, draw, void(entity))
index 3c4013d..128e614 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_QUIT_H
+#define DIALOG_QUIT_H
 CLASS(XonoticQuitDialog, XonoticDialog)
        METHOD(XonoticQuitDialog, fill, void(entity))
        ATTRIB(XonoticQuitDialog, title, string, _("Quit"))
index 30a3537..2932bcd 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SANDBOXTOOLS_H
+#define DIALOG_SANDBOXTOOLS_H
 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")) // ;)
index 16e00f7..2962cc9 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_H
+#define DIALOG_SETTINGS_H
 CLASS(XonoticSettingsDialog, XonoticDialog)
        METHOD(XonoticSettingsDialog, fill, void(entity))
        ATTRIB(XonoticSettingsDialog, title, string, _("Settings"))
index 2245edb..88de16f 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_AUDIO_H
+#define DIALOG_SETTINGS_AUDIO_H
 CLASS(XonoticAudioSettingsTab, XonoticTab)
        METHOD(XonoticAudioSettingsTab, fill, void(entity))
        ATTRIB(XonoticAudioSettingsTab, title, string, _("Audio"))
index 109dd27..34dbe37 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_EFFECTS_H
+#define DIALOG_SETTINGS_EFFECTS_H
 CLASS(XonoticEffectsSettingsTab, XonoticTab)
        METHOD(XonoticEffectsSettingsTab, fill, void(entity))
        ATTRIB(XonoticEffectsSettingsTab, title, string, _("Effects"))
index d2db0ab..9726162 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_GAME_H
+#define DIALOG_SETTINGS_GAME_H
 CLASS(XonoticGameSettingsTab, XonoticTab)
        METHOD(XonoticGameSettingsTab, fill, void(entity))
        ATTRIB(XonoticGameSettingsTab, title, string, _("Game"))
index b51f61b..a5ee7fe 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_GAME_CROSSHAIR_H
+#define DIALOG_SETTINGS_GAME_CROSSHAIR_H
 CLASS(XonoticGameCrosshairSettingsTab, XonoticTab)
        //METHOD(XonoticGameCrosshairSettingsTab, toString, string(entity))
        METHOD(XonoticGameCrosshairSettingsTab, fill, void(entity))
index 7489207..b8b1f93 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_GAME_HUD_H
+#define DIALOG_SETTINGS_GAME_HUD_H
 CLASS(XonoticGameHUDSettingsTab, XonoticTab)
        //METHOD(XonoticGameHUDSettingsTab, toString, string(entity))
        METHOD(XonoticGameHUDSettingsTab, fill, void(entity))
index 9bf5130..dcc0037 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_GAME_HUDCONFIRM_H
+#define DIALOG_SETTINGS_GAME_HUDCONFIRM_H
 CLASS(XonoticHUDConfirmDialog, XonoticDialog)
        METHOD(XonoticHUDConfirmDialog, fill, void(entity))
        ATTRIB(XonoticHUDConfirmDialog, title, string, _("Enter HUD editor"))
index 1c2ee73..ac2bf76 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_GAME_MESSAGES_H
+#define DIALOG_SETTINGS_GAME_MESSAGES_H
 CLASS(XonoticGameMessageSettingsTab, XonoticTab)
        //METHOD(XonoticGameWeaponsSettingsTab, toString, string(entity))
        METHOD(XonoticGameMessageSettingsTab, fill, void(entity))
index 404215e..6bdac49 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_GAME_MODEL_H
+#define DIALOG_SETTINGS_GAME_MODEL_H
 CLASS(XonoticGameModelSettingsTab, XonoticTab)
        //METHOD(XonoticGameModelSettingsTab, toString, string(entity))
        METHOD(XonoticGameModelSettingsTab, fill, void(entity))
index b093800..6d5e82d 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_GAME_VIEW_H
+#define DIALOG_SETTINGS_GAME_VIEW_H
 CLASS(XonoticGameViewSettingsTab, XonoticTab)
        //METHOD(XonoticGameCrosshairSettingsTab, toString, string(entity))
        METHOD(XonoticGameViewSettingsTab, fill, void(entity))
index 739c186..148775b 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_GAME_WEAPONS_H
+#define DIALOG_SETTINGS_GAME_WEAPONS_H
 CLASS(XonoticGameWeaponsSettingsTab, XonoticTab)
        //METHOD(XonoticGameWeaponsSettingsTab, toString, string(entity))
        METHOD(XonoticGameWeaponsSettingsTab, fill, void(entity))
index 90cc134..0f22625 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_INPUT_H
+#define DIALOG_SETTINGS_INPUT_H
 CLASS(XonoticInputSettingsTab, XonoticTab)
        METHOD(XonoticInputSettingsTab, fill, void(entity))
        ATTRIB(XonoticInputSettingsTab, title, string, _("Input"))
index 4bc26b2..6a0ae52 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_INPUT_USERBIND_H
+#define DIALOG_SETTINGS_INPUT_USERBIND_H
 CLASS(XonoticUserbindEditDialog, XonoticDialog)
        METHOD(XonoticUserbindEditDialog, loadUserBind, void(entity, string, string, string))
        METHOD(XonoticUserbindEditDialog, fill, void(entity))
index 2372e32..5a43437 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_MISC_H
+#define DIALOG_SETTINGS_MISC_H
 CLASS(XonoticMiscSettingsTab, XonoticTab)
        METHOD(XonoticMiscSettingsTab, fill, void(entity))
        ATTRIB(XonoticMiscSettingsTab, title, string, _("Misc"))
index 2993fa3..e1b7ba8 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_MISC_CVARS_H
+#define DIALOG_SETTINGS_MISC_CVARS_H
 CLASS(XonoticCvarsDialog, XonoticDialog)
        METHOD(XonoticCvarsDialog, fill, void(entity))
        METHOD(XonoticCvarsDialog, showNotify, void(entity))
index 19a8743..20ad7fe 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_MISC_RESET_H
+#define DIALOG_SETTINGS_MISC_RESET_H
 CLASS(XonoticResetDialog, XonoticDialog)
        METHOD(XonoticResetDialog, fill, void(entity))
        ATTRIB(XonoticResetDialog, title, string, _("Factory reset"))
index 9e2b0d0..0e9c158 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_USER_H
+#define DIALOG_SETTINGS_USER_H
 CLASS(XonoticUserSettingsTab, XonoticTab)
        METHOD(XonoticUserSettingsTab, fill, void(entity))
        ATTRIB(XonoticUserSettingsTab, title, string, _("User"))
index 24644c0..3d4025a 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_USER_LANGUAGEWARNING_H
+#define DIALOG_SETTINGS_USER_LANGUAGEWARNING_H
 CLASS(XonoticLanguageWarningDialog, XonoticDialog)
        METHOD(XonoticLanguageWarningDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls
        ATTRIB(XonoticLanguageWarningDialog, title, string, _("Warning"))
index 7a22cf4..8dae62f 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SETTINGS_VIDEO_H
+#define DIALOG_SETTINGS_VIDEO_H
 CLASS(XonoticVideoSettingsTab, XonoticTab)
        METHOD(XonoticVideoSettingsTab, fill, void(entity))
        ATTRIB(XonoticVideoSettingsTab, title, string, _("Video"))
index 978e3ad..0112f9a 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SINGLEPLAYER_H
+#define DIALOG_SINGLEPLAYER_H
 CLASS(XonoticSingleplayerDialog, XonoticDialog)
        METHOD(XonoticSingleplayerDialog, fill, void(entity))
        ATTRIB(XonoticSingleplayerDialog, title, string, _("Singleplayer"))
index 275cc04..b01731b 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_SINGLEPLAYER_WINNER_H
+#define DIALOG_SINGLEPLAYER_WINNER_H
 CLASS(XonoticWinnerDialog, XonoticDialog)
        METHOD(XonoticWinnerDialog, fill, void(entity))
        METHOD(XonoticWinnerDialog, focusEnter, void(entity))
index cab9381..8486bf7 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_TEAMSELECT_H
+#define DIALOG_TEAMSELECT_H
 CLASS(XonoticTeamSelectDialog, XonoticRootDialog)
        METHOD(XonoticTeamSelectDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls
        METHOD(XonoticTeamSelectDialog, showNotify, void(entity))
index aaa46ea..408d62a 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef GAMETYPEBUTTON_H
+#define GAMETYPEBUTTON_H
 CLASS(XonoticGametypeButton, RadioButton)
        METHOD(XonoticGametypeButton, configureXonoticGametypeButton, void(entity, float, string, string))
        METHOD(XonoticGametypeButton, setChecked, void(entity, float))
index faaa177..fde6058 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef GAMETYPELIST_H
+#define GAMETYPELIST_H
 CLASS(XonoticGametypeList, XonoticListBox)
        METHOD(XonoticGametypeList, configureXonoticGametypeList, void(entity))
        ATTRIB(XonoticGametypeList, rowsPerItem, float, 2)
index 2e51d89..40ddc33 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef IMAGE_H
+#define IMAGE_H
 CLASS(XonoticImage, Image)
        METHOD(XonoticImage, configureXonoticImage, void(entity, string, float))
 ENDCLASS(XonoticImage)
index b15e475..eb07f5d 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef INPUTBOX_H
+#define INPUTBOX_H
 CLASS(XonoticInputBox, InputBox)
        METHOD(XonoticInputBox, configureXonoticInputBox, void(entity, float, string))
        METHOD(XonoticInputBox, focusLeave, void(entity))
index e069696..07d4d6a 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef KEYBINDER_H
+#define KEYBINDER_H
 CLASS(XonoticKeyBinder, XonoticListBox)
        METHOD(XonoticKeyBinder, configureXonoticKeyBinder, void(entity))
        ATTRIB(XonoticKeyBinder, rowsPerItem, int, 1)
@@ -28,6 +29,7 @@ entity makeXonoticKeyBinder();
 void KeyBinder_Bind_Change(entity btn, entity me);
 void KeyBinder_Bind_Clear(entity btn, entity me);
 void KeyBinder_Bind_Edit(entity btn, entity me);
+void KeyBinder_Bind_Reset_All(entity btn, entity me);
 #endif
 
 #ifdef IMPLEMENTATION
index 85461e6..caa83a8 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef LANGUAGELIST_H
+#define LANGUAGELIST_H
 CLASS(XonoticLanguageList, XonoticListBox)
        METHOD(XonoticLanguageList, configureXonoticLanguageList, void(entity))
        ATTRIB(XonoticLanguageList, rowsPerItem, float, 1)
index ea126be..4dc6f86 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
 CLASS(MainWindow, ModalController)
        METHOD(MainWindow, configureMainWindow, void(entity))
        METHOD(MainWindow, draw, void(entity))
index 9bcc1af..796ffbc 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef MAPLIST_H
+#define MAPLIST_H
 CLASS(XonoticMapList, XonoticListBox)
        METHOD(XonoticMapList, configureXonoticMapList, void(entity))
        ATTRIB(XonoticMapList, rowsPerItem, float, 4)
index 2bbd8db..00f99ae 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef NEXPOSEE_H
+#define NEXPOSEE_H
 CLASS(XonoticNexposee, Nexposee)
        METHOD(XonoticNexposee, configureXonoticNexposee, void(entity))
        METHOD(XonoticNexposee, close, void(entity))
index 73d6dd2..8e0e9ec 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef PLAYERMODEL_H
+#define PLAYERMODEL_H
 CLASS(XonoticPlayerModelSelector, XonoticImage)
        METHOD(XonoticPlayerModelSelector, configureXonoticPlayerModelSelector, void(entity))
        METHOD(XonoticPlayerModelSelector, loadCvars, void(entity))
index 5d71755..8d3b880 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef PLAYLIST_H
+#define PLAYLIST_H
 CLASS(XonoticPlayList, XonoticListBox)
        METHOD(XonoticPlayList, configureXonoticPlayList, void(entity))
        ATTRIB(XonoticPlayList, rowsPerItem, float, 1)
index 000da90..702b131 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef RADIOBUTTON_H
+#define RADIOBUTTON_H
 CLASS(XonoticRadioButton, RadioButton)
        METHOD(XonoticRadioButton, configureXonoticRadioButton, void(entity, float, string, string, string))
        METHOD(XonoticRadioButton, draw, void(entity))
index 756c1a4..4ab74ae 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef SCREENSHOTIMAGE_H
+#define SCREENSHOTIMAGE_H
 CLASS(XonoticScreenshotImage, XonoticImage)
        METHOD(XonoticScreenshotImage, configureXonoticScreenshotImage, void(entity))
        METHOD(XonoticScreenshotImage, load, void(entity, string))
index 8730fa8..41576bb 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef SCREENSHOTLIST_H
+#define SCREENSHOTLIST_H
 CLASS(XonoticScreenshotList, XonoticListBox)
        METHOD(XonoticScreenshotList, configureXonoticScreenshotList, void(entity))
        ATTRIB(XonoticScreenshotList, rowsPerItem, float, 1)
index 7837693..2c25f4a 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef SERVERLIST_H
+#define SERVERLIST_H
 CLASS(XonoticServerList, XonoticListBox)
        METHOD(XonoticServerList, configureXonoticServerList, void(entity))
        ATTRIB(XonoticServerList, rowsPerItem, float, 1)
index f667a88..3473338 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef SKINLIST_H
+#define SKINLIST_H
 CLASS(XonoticSkinList, XonoticListBox)
        METHOD(XonoticSkinList, configureXonoticSkinList, void(entity))
        ATTRIB(XonoticSkinList, rowsPerItem, float, 4)
index 8130534..129193b 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef SLIDER_H
+#define SLIDER_H
 CLASS(XonoticSlider, Slider)
        METHOD(XonoticSlider, configureXonoticSlider, void(entity, float, float, float, string))
        METHOD(XonoticSlider, setValue, void(entity, float))
index e3e77c3..75ea834 100644 (file)
@@ -1,6 +1,7 @@
 #include "../../warpzonelib/mathlib.qh"
 
-#ifdef INTERFACE
+#ifndef SLIDER_DECIBELS_H
+#define SLIDER_DECIBELS_H
 CLASS(XonoticDecibelsSlider, XonoticSlider)
        METHOD(XonoticDecibelsSlider, loadCvars, void(entity))
        METHOD(XonoticDecibelsSlider, saveCvars, void(entity))
index 0bfe05c..9a09816 100644 (file)
@@ -1,4 +1,6 @@
-#ifdef INTERFACE
+#ifndef SLIDER_PARTICLES_H
+#define SLIDER_PARTICLES_H
+#include "textslider.qc"
 CLASS(XonoticParticlesSlider, XonoticTextSlider)
        METHOD(XonoticParticlesSlider, configureXonoticParticlesSlider, void(entity))
        METHOD(XonoticParticlesSlider, loadCvars, void(entity))
index 201da72..14f5c61 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef SLIDER_PICMIP_H
+#define SLIDER_PICMIP_H
 CLASS(XonoticPicmipSlider, XonoticTextSlider)
        METHOD(XonoticPicmipSlider, configureXonoticPicmipSlider, void(entity))
        METHOD(XonoticPicmipSlider, draw, void(entity))
index 03d3e34..ad273ca 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef SLIDER_SBFADETIME_H
+#define SLIDER_SBFADETIME_H
 CLASS(XonoticScoreboardFadeTimeSlider, XonoticTextSlider)
        METHOD(XonoticScoreboardFadeTimeSlider, configureXonoticScoreboardFadeTimeSlider, void(entity))
        METHOD(XonoticScoreboardFadeTimeSlider, loadCvars, void(entity))
index ae85977..ec80643 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef SOUNDLIST_H
+#define SOUNDLIST_H
 CLASS(XonoticSoundList, XonoticListBox)
        METHOD(XonoticSoundList, configureXonoticSoundList, void(entity))
        ATTRIB(XonoticSoundList, rowsPerItem, float, 1)
index ab22ff0..3c5e17f 100644 (file)
@@ -1,7 +1,8 @@
 #include "../../common/counting.qh"
 #include "../../common/playerstats.qh"
 
-#ifdef INTERFACE
+#ifndef STATSLIST_H
+#define STATSLIST_H
 CLASS(XonoticStatsList, XonoticListBox)
        METHOD(XonoticStatsList, configureXonoticStatsList, void(entity))
        ATTRIB(XonoticStatsList, rowsPerItem, float, 1.4)
index fd4b50c..a5cdf2b 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef TAB_H
+#define TAB_H
 CLASS(XonoticTab, Tab)
        // still to be customized by user
        /*
index d3aba33..0640171 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef TABCONTROLLER_H
+#define TABCONTROLLER_H
 CLASS(XonoticTabController, ModalController)
        METHOD(XonoticTabController, configureXonoticTabController, void(entity, float))
        METHOD(XonoticTabController, makeTabButton, entity(entity, string, entity))
index 7bab8c4..ef18088 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef TEXTLABEL_H
+#define TEXTLABEL_H
 CLASS(XonoticTextLabel, Label)
        METHOD(XonoticTextLabel, configureXonoticTextLabel, void(entity, float, string))
        METHOD(XonoticTextLabel, draw, void(entity))
@@ -7,6 +8,7 @@ CLASS(XonoticTextLabel, Label)
        ATTRIB(XonoticTextLabel, disabledAlpha, float, SKINALPHA_DISABLED)
 ENDCLASS(XonoticTextLabel)
 entity makeXonoticTextLabel(float theAlign, string theText);
+entity makeXonoticHeaderLabel(string theText);
 #endif
 
 #ifdef IMPLEMENTATION
index 21aa1f4..d86252e 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef WEAPONARENACHECKBOX_H
+#define WEAPONARENACHECKBOX_H
 CLASS(XonoticWeaponarenaCheckBox, CheckBox)
        METHOD(XonoticWeaponarenaCheckBox, configureXonoticWeaponarenaCheckBox, void(entity, string, string))
        METHOD(XonoticWeaponarenaCheckBox, setChecked, void(entity, float))
index a82f252..d6eae6e 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef WEAPONSLIST_H
+#define WEAPONSLIST_H
 CLASS(XonoticWeaponsList, XonoticListBox)
        METHOD(XonoticWeaponsList, configureXonoticWeaponsList, void(entity))
        METHOD(XonoticWeaponsList, toString, string(entity))