]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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 d327dded9adc81772719bd41a8fc98bcd0486fb2..94df30b37ee686dcb113b075351c343ebcc98e11 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 9f450236df310d7d539da869495f072287f9d6ff..fb4961d86f225ce1cc84f46870938393fd3a3ebb 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 fa643390f3592646d58885dd69bbcc2b1833ba62..f2c3d46e9c905c770c17a322da5b01b203af5b34 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 3a7ec55a7f8317bee44098cbce0dd7a76c34d129..0e194bf6b32cf9114b328a2f6eb5f866a55c2a09 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 9b4bb4dab301037d5a46ea809ec69a4a342f2de5..68b90d586394939a459e81345903a605f7be2e75 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 73acad07e6d8365784e8d3d2e598ee52770d6c1b..62cfa137838fdc2c7dbce4908f27efa37cf71691 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 422390a69426dba97449a555ac95fff0b35d20bc..6b6f4693dc4a48d83823a7144c29f033daacc632 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 44a0ada9b0bf8d57454baf7b5aa5efa981323adf..8d17f98c68b1eaeb0dcb7fcfa1472c11c7cf9c3b 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 56cf449bd4c28f8983b2cdb983ca88c122f73e82..e220b07666215b717ccf2a569fba545e5c886fdd 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 b4c6fdc45c861379bdc3845e0c5188238bffaaab..a5d01bf92af8e33c4d05439788e38f10c99e4462 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 e68a0931d13882e0b7c2d51cb8c230eda7e159fb..b6048ac682219d7958cf2f3699e599ba634b0c13 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 b78b6f589b58a7be088bd0b8a25dd344f2686be3..83e5d427a4122288f4b8229801f60cb31118e146 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 bb02fda71b8a7a4e16559d9d730e7bea3a693e40..fd6eab1fad459fe662b2840b282f85d4717bae94 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 7da569357d2dd37af9b4700b9dd1c184622d6dcb..b06e2556513f44d0cded72d0daeb5b0973e59388 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 2e91ee15b725d230c396ecff4f2bb28f2c675155..751e5c72729030e729e1641df4b09184593ab668 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 4623a5ffaad49c68a1720b60738106367caee9ed..385ed502a8c41cfff91af0c70e1216dfbef80ee5 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 228f7a51363a1d70749912b5ab2cf5c0e07dc0e9..c1bc021f88121062426a674868297c112c338c0c 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 b0d30cb1b5cf5bc44889238990d21a3d38512146..69d54b7a0733e6d6b766f88b385906237e6a4fb7 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 97168fc53c8c135cb18730f3cff377f3cfa20d5d..d8cadea3d6995267e5e5fddef4a46d29dd6a4f94 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 b7605e4897dfb15a62811096cabd8a4474cdec54..7ee9cefa71700b66bdf8f9e79afbb4addf29b800 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 d5796c190425056dde86b168717c7ff755e4900d..3fdcccc6896c52a71267f7a4fdb9abc7684213dc 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 db8b55260e7149eab2c03e01150b2296b0a99f27..663f33a8f2ef949d90a659eb7cc9b7eb1360a74c 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 00f6017aa06b3bdf4b2143fbd132cd4dac4885e3..33d467c2a08a4caaa302ccf75dfbd3d344a42d6e 100644 (file)
@@ -14,9 +14,6 @@
 
 #define localcmd cmd
 
-#define NULL (null_entity)
-#define world NULL
-
 // constants
 
 const int GAME_ISSERVER        = 1;
index a8337501be68c5d77b007bc6da7e2441aa87b377..60b2f8b319849dc8aefd3490425945fac2f2e70f 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 631b91f558366515391756b65b83d76b4c088cc1..abfb303dbc21487eed7174c609081f95a85ba378 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 84f9029c0f155d1317ed355209a5b88e9ae2ac6a..10c81e7ef34bbec061df61789857970764025c1f 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 897d05d8df9bbe8faff3700ce35364e75df10543..07b6a074ceca2a341dba0c81976c0df3ab7c6046 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 d7d203160c0a0b59e4936f9e621880ff8b2bf18b..6798d9b01b2602ba4cae85e78768788a6dde2467 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 99018cb2d695c3c492f4bc8bbecbf990bbb52f12..8811e952c744c7fd748ec94184330d5817033485 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 3ce8fa29ef4502233a2d2115bdd299848eb0fe42..826a0b4f2d7c6d81cf22f906f3fd7230dbc99a32 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 06e4926dbdcbadea7320288e82665906dceaa80b..3ebf489271cf495ecb027afddbd06525068e1ab2 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 321bf7ebf47ffc9f40bd9d8cda1666e44de0c2ac..289824f704073a3a099d21b807710fe99957b3ec 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 22cdf8b0bee50902af50add2997af954f9af1c9d..989869c6b326dcd79f323da35ae4a4d4f28c9f81 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 c36b710bf1301fff3b4b56018008bb15ad93c503..eefed8e6ea5943cd081bf424b45f80e71b5bbf74 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 527c0512e9cb293b8032ffaa99e0c0e94e57623f..952ccb70ae2b022169b4dab8655be540ddba99c5 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 86da883a97830c3c736a77f95fc16ff52e989f67..c74fcf9f4ce15f655c85181c595a3ece38553e11 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 4a5db88dff54f8d244597e5928cad6b2abb87710..bf5e1654b5c6ed0509605c740e7ae2817f96f027 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 e0c17d55c60738d0173eb96cde8def83c6562e86..8c1272e4891bc8478d8978f7416a2f7e1658bc46 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 c6f320bc95a20bd7c6a3f78cd24afa00e8173caa..0d04daf589d02df1ea920d8416f2b040464d596b 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 4ed6352f923e8762b1466f93ec72e3c02356ee65..ec0d1690d907bd1e7ceedd6448dfa3828776cd3e 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 a965f2cf961870010010eb27768c42a8b580239e..87f8625897090474edbcfe247f9c6c31e6797dc9 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 170a4bba67211d3f0abe0438168edea6212de7aa..fa9d60e79a143a41c7f20077bf955340f5f61a64 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 3f6f30fc9384e911ee4677554fd978b301b45da9..4901fc6a970351bb2aae8964f3a5e51752006a5c 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef DIALOG_H
+#define DIALOG_H
 CLASS(XonoticDialog, Dialog)
        // still to be customized by user
        /*
index ba8ddbba37303b93393b3eac339aaa0dc245d7ad..b87da091b413759c3090a673031823836740ccef 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 87db1efd865d57091efc0f610815ad0a146ec3b3..3cf01fac73f5fa8652b7ce4f4febf17163d6f6db 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 14193b5ef8db8c3f0b376eac6e0c61dd608db93a..adceff3a6655d24d903db8aa712e7a9fa3ec85b1 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 285754d862deb9145a6b7560fd8bc37ac350a958..29b2a951b25a7aaa715641a24f1c30c065f88e9d 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 dd770163213111d9274418ec5c757597cf480cd2..f27c3c8c7cc28b097cb8abb436503d45d850eb23 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 ef314a4ff57d8da7e12c94d403636a48127356bd..34e9d4d610aeebf212b05dc22cf07767da66e012 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 f5656fa487b39bfaf02b54450f7339079c2e4fd5..cc99b73fcfe1934e234e08ab6a34aeac36770602 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 e25ce9a42ad974d516e2fd2ae23b3298f8b10a2b..0ed8f7afb8b1deaf73e88983ed0c585728f200bf 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 05e06054eb293c2366f493456a39330fa6fab707..6c654e74067f0217cc8d9a0048da584bb8687956 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 f5518508c444600af7cfa0da3ab0af36567600d1..17394ffd59cb1abe386e04ea197a0be6d57589c1 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 f6120dac3cc5d3d68c742bf715a1a9c5262a1376..bab993a3a723e75ec22f1f1349c4fbd56694b18b 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 d97277142553aec426613096c035840a9173ab6c..d3ed373e411290d4a878316a0ac0024eca19b41f 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 0d025c9691faa4ac404c086a2fcf94ea5d57bf44..b71bd0828b020fd261a811fa7535d3d159493cc3 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 1515a3365b0c9b816b42c46d54856a12fd6bb7f9..70fea996152c960a10ed2452a3541856f2429aa6 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 9e3eac3cfc73d43ef6aa8f7b9f8ef1f13fec998c..4f1fc4cbd4c821d8a10b333ac9eabd08e505a80f 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 95a53daa5eb5ada9ca279cb16167b0a48ff4f9c7..581c3b9089e50c5bbcfc1a8fb88369cc0770563a 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 7b7d60b0f18006a63585364dce3e0b80afc4d214..280985a5afe72cea0d5127e814a9c0f720daa6c8 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 31ba3b550477896c99dbfca055aca031e85af30a..2cb64c1516659b7f2abfc628fd39e5e70dbf69dc 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 4164005c572fe4ea15b49f0dcdcffa5a68d661b0..cbbeca78b0e0bea8c6ab8699a4d2d1ebae256859 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 249855cada50b682f956cbb797679b7d0cfd476a..2d2dad3bbd0b63a9d38d35fb2daab93ee392a932 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 c288585a5c920e627eb66c88a438ffe601107b00..ea9339ba57b227f9674a86ad1c7b2e98ac25b939 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 d284041c598aa07685badf48ce3c77f7ac58e636..dda708ad9e5f8f0c98a46942a0441f2db1116fa7 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 84ce8a1ab5662f8aedb9b46c9f3577ed32566fa1..13a8e3184bbc3d5c7b67a198132565e342e62895 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 ab6f42834025d5d3b53015e849b671cb0d0a4c24..b082ae69a6217b9b16e59cae99bf77d43dc970ff 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 9ac61ec28f88db4ffebddbf1fc59bff25cae920b..9cdbd2c4d2201f5b9ed121a39d7b5ed0c44d1b80 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 76b1e064ac93544031748b3ef4273af4482085f5..d58fdc733068129d3372ccad29b43b433dcb52c8 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 74b8df6a6c8f6deee6e8f58999c25fa83e29227e..10e1128402fd0cec98a83aed75ac68e7db020a3e 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 c17fdd75dc6908ebe2e1bc10c8f0f99437dedffe..a4e0bbc98897598dfe049a15aa8b9fa15eb61019 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 e79885e64988651cd2a8466435ee6a2e1dd61c5f..68367fc0ac2aea38a7f0f2de74566182b48fe043 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 7fa2072deeeb2b2a675373b7310d46a46f2eea64..a00e70e00a954b696358a46b5f4f50d0e099e3d9 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 d71ad6f2eca2cc53fccea1740a31e3ba7e985d42..62c72b17d03542845e3257d7b2d2b42f9d7a15c7 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 ddb83e0a34a8a20736c3e356de6c833aaa78860b..efb96cdf83964a114d767a6b8913c0b3fda79fbb 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 f072645a9573897972b2d1f09aa33f7a7bf0f6d1..797ed8116b8687a205c50e1c5f572dec22db7773 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 dd47da81162e945af8867306fa02c9e34bd051e7..4016e0f2aecc9a074981ab191828b9a8fc6e4e62 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 8c6fc8025e46d9ab75ea653ab167bdc0b2096b49..4b4c948593462bde20e88a28af9c7783ec32e55e 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 3c4013d956053a639c8b902a35cf4dbd05b44edd..128e614beb092d2449c3b8af56ea5791c4ad7d71 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 30a353704dd9f177ddf107894d7d782db0c329c9..2932bcd468885958d63f6dd7c2186bc707da1634 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 16e00f7ebd79f2dd28c8c748434638f92e42ac8c..2962cc947fb3d497ba5007f15bbb3654c6242fc6 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 2245edbd41dc772099d37de7510cd3194e776a2c..88de16ff9e5a6c31fa4cfcc6f5c9aff6af453c54 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 109dd2763c2bec75e55d0f2dad0e0725474baaeb..34dbe37b96dccaa3e35ef5155ffe742f79b28df9 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 d2db0ab06d0f60e8894df20a22dc051c8cc3c43e..9726162014017c402d3e8fa6eae31b9398b45292 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 b51f61b9a5596c0a009e66a939b04624a4aabe8e..a5ee7fe2d4c8ee9774fc22ab85c5b298a2b92960 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 7489207a1b4afebb3a602a8aed2293ff12e44426..b8b1f93e5b73688a12be64bf519efac64b4a8a20 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 9bf5130ab4eedd041b50255ea8c79da0af57efc0..dcc00377177adf999ec536d18b0ceceea873f4dc 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 1c2ee73f5f5cd197895fef07aa56a5ee0ba0f08b..ac2bf76e2b49d1afaff3133d8dd400708974bee6 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 404215e30b880ad341830f8e3c8157df0163ce74..6bdac49d3eab174e586acbb3032e2a1d7a00d43e 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 b0938009284bab1249c7361f45e1ba370eba2766..6d5e82db991347e91f4bbde41e959b60b67dd8e9 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 739c186b11a473d60b6c76e4d88621de17b5eddc..148775b1390834e5ef0dd3f086d6d888a4dfcd2d 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 90cc13484228fa110d131ea8e5936c5b414132bd..0f22625400b5e6e67474f7cb144cfda52fb1ea70 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 4bc26b2e449bd0198a06e5d031ccf3cbbcd17cc7..6a0ae52bc4f96c39a99e82d734ebdcb7e688a3e7 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 2372e320843e5e85ecaad913ef96edd6ab17e719..5a4343796b387ffbd4af97bd32e2dc3efe64e5bc 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 2993fa30e3ef700ec494536ecebfdbbe79c131c5..e1b7ba807f5ef0d4c695a5544c41515c86679ca7 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 19a87435406c2841bef137444adcca76fb90bda9..20ad7fe4841bc208c80343f281919f1dd29d17f2 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 9e2b0d034c1b3fe4ea1c156368b15dabe94a9b0f..0e9c1585e313fadb26e71b7650b0b41d88dc6c81 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 24644c0ac3752b5dbacdde7fbb4c6d576819c6ab..3d4025ae7d802c61b60524f8e84ad5c1e3dd951f 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 7a22cf4a8622d015ca7606524bd816120e152c1c..8dae62f5165a4f525725ef5630953957d8f91a6b 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 978e3adc3f6231ae45c93153a219aef4215ab780..0112f9a5bc033160750d5d57abf42e2718ea3c86 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 275cc04337e81513de36a84cd766c4804910ed9c..b01731bde6b7bf55a8616a683dc1fd7e26509de7 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 cab938185d2d364e52653d53fbec79e84a2ef5e5..8486bf7a0f6627c5abdfcfbdfade9dfddb318e84 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 aaa46eaf7b54dfab2b11a42bd51511f157446083..408d62a32d48e305a115eef755d79bf8c8263b65 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 faaa177ca47d0f188e2389d596493993821e1de2..fde605898a1fafabec28987f11c265661bd58def 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 2e51d899726b94a49232c3590b1f97d0756b38b3..40ddc3384021f5d6728f0383e4410c139782b861 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 b15e475a19fc95aaea83679decae6d24f0eb4b9b..eb07f5d18182f37da110945713cfb744d2abf612 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 e0696961074118aa31ad1fab7963b2099cc3f268..07d4d6a1beea5b85a577b2173bad979e73129272 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 85461e63ee7847386f8043c17de5aee098b1a196..caa83a8d3aff3ca0fb7e9ad575279c072becf349 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 ea126beb522b9ddce5045030fce9224656fabf46..4dc6f861009edd9d5452e0035dda9a46a81883f9 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 9bcc1afc41c01fd63e638a05e34fbedd3f25307e..796ffbc3720fb83823eede11270e413d73a23721 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 2bbd8db0a58c40dcfd0bcc41b6a14e5c065da78f..00f99aea1ef68c266c2af87ef00ee832fdfa2506 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 73d6dd28c35fe4bf768059ea2ca7160ff03001cf..8e0e9ecd27705909a249bc5d1ac8ef972251c09d 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 5d71755d0f5528425312eb6f70691649237b3e9b..8d3b880cccf1eccf68f43d159ff3455594cae34b 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 000da90e3485c1fa6d5dd9ee91de532a7c5e81b7..702b1310d186ad54cfb6f3c1ca81fd797f16a722 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 756c1a449cb4454297109524e412d435a6a6d37b..4ab74aead4c811f7a0f5b7d95663885843b4b8d2 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 8730fa8dd2a0b224bf1a461967836335b0f66e00..41576bb047192de2f7fb6d9d304ec68e9a618093 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 7837693b4975c8d9d878023df8199f1c249de3e1..2c25f4a76ace1635f0ba1971211e78f762d9aca8 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 f667a88477e8bb77dd77acfbd17e4eab20f0a6f2..34733386a683e5df1db408bf796bf7a354d62bb0 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 8130534eb41d54f5325c7bfbd4c98050c1c53b86..129193b125261e5b9f543fc74275d2f5a289ab53 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 e3e77c31975648c42e4d5cd6c1ab6ea05b98ac32..75ea83454adc6544adea8bcb3881f0134e9614f0 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 0bfe05c5d3a4a3da8c0e13a146481ba2387bfe59..9a098165e47eb4666c692a483255a4aced7eb0e7 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 201da72d5eeb72e8c48ceed89a690d1f6f31ef14..14f5c61f779f6d9bbc988b0854d143b73958c3c3 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 03d3e34026b9d513e724585a0db1fdc8098a4566..ad273ca0482d4f139d79de1c3668ac3f1823441c 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 ae859779ed1ac62722dfb863adcdc22aa5f5c90a..ec80643b989c40fb3db873532f510cc87b951668 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 ab22ff0c753f321f0b13fc21d539cedbe9c47f67..3c5e17fe6be8acee1992811952f469cba3974340 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 fd4b50cc3267a628575e31ef458378592c820398..a5cdf2b8ff05386601203c15c3780eff6218a3e6 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef INTERFACE
+#ifndef TAB_H
+#define TAB_H
 CLASS(XonoticTab, Tab)
        // still to be customized by user
        /*
index d3aba3331ba1678daf31dff693162e506e01ed6b..0640171a2563c2cbe16bbf0df72ee77d1bc50c4b 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 7bab8c4060a7a03bfed521b65bbb82e711b685a9..ef180885c12966d5822eb5ecdaa30fedfb2d4c6e 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 21aa1f4e2ef0f55db21fe577f5afd416601f1be6..d86252e13aa0f19d8e4c86daf07110abc0753191 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 a82f2525e6be4b318127d09be7ec378059dea8df..d6eae6ec93317bb659b541dfd95c1468fe4f6643 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))