]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge CLASS and EXTENDS, #define NEW(cname) (spawn##cname())
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 3 May 2015 11:39:11 +0000 (21:39 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 3 May 2015 11:39:11 +0000 (21:39 +1000)
135 files changed:
qcsrc/menu/anim/animation.qc
qcsrc/menu/anim/animhost.qc
qcsrc/menu/anim/easing.qc
qcsrc/menu/anim/keyframe.qc
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.qc
qcsrc/menu/oo/base.qh
qcsrc/menu/oo/implementation.qc
qcsrc/menu/oo/interface.qc
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_firstrun.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/listbox.qc
qcsrc/menu/xonotic/mainwindow.qc
qcsrc/menu/xonotic/maplist.qc
qcsrc/menu/xonotic/nexposee.qc
qcsrc/menu/xonotic/playerlist.qc
qcsrc/menu/xonotic/playermodel.qc
qcsrc/menu/xonotic/playlist.qc
qcsrc/menu/xonotic/radiobutton.qc
qcsrc/menu/xonotic/rootdialog.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_resolution.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/textslider.qc
qcsrc/menu/xonotic/weaponarenacheckbox.qc
qcsrc/menu/xonotic/weaponslist.qc

index 26b01d71801f3555fa7cc5f0b329c833a5752848..411896adece981af003d40a613338fb76fa4dfd9 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(Animation) EXTENDS(Object)
+CLASS(AnimationObject)
        METHOD(Animation, configureAnimation, void(entity, entity, void(entity, float), float, float, float, float))
        METHOD(Animation, setTimeStartEnd, void(entity, float, float))
        METHOD(Animation, setTimeStartDuration, void(entity, float, float))
index c46334d530aed763cd3e0c8706e387131e0d1730..9f450236df310d7d539da869495f072287f9d6ff 100644 (file)
@@ -1,7 +1,7 @@
 #include "../menu.qh"
 
 #ifdef INTERFACE
-CLASS(AnimHost) EXTENDS(Object)
+CLASS(AnimHostObject)
        METHOD(AnimHost, addAnim, void(entity, entity))
        METHOD(AnimHost, removeAnim, void(entity, entity))
        METHOD(AnimHost, removeAllAnim, void(entity))
index 94ea9cf0872da839e836be94e28cda460f029bab..9856c2385fa830c1b171a7a2b3ef966eb4658cbd 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(Easing) EXTENDS(Animation)
+CLASS(EasingAnimation)
        METHOD(Easing, calcValue, float(entity, float, float, float, float))
        METHOD(Easing, setMath, void(entity, float(float, float, float, float)))
        ATTRIB(Easing, math, float(float, float, float, float), easingLinear)
@@ -24,7 +24,7 @@ entity makeHostedEasing(entity obj, void(entity, float) objSetter, float(float,
 entity makeEasing(entity obj, void(entity, float) objSetter, float(float, float, float, float) func, float animStartTime, float animDuration, float animStartValue, float animEnd)
 {
        entity me;
-       me = spawnEasing();
+       me = NEW(Easing);
        me.configureAnimation(me, obj, objSetter, animStartTime, animDuration, animStartValue, animEnd);
        me.setMath(me, func);
        return me;
index 3bcda94e692939b733c668cf09e46b27e59364c6..3a7ec55a7f8317bee44098cbce0dd7a76c34d129 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(Keyframe) EXTENDS(Animation)
+CLASS(KeyframeAnimation)
        METHOD(Keyframe, addEasing, entity(entity, float, float, float(float, float, float, float)))
        METHOD(Keyframe, addAnim, void(entity, entity))
        METHOD(Keyframe, calcValue, float(entity, float, float, float, float))
@@ -26,7 +26,7 @@ entity makeHostedKeyframe(entity obj, void(entity, float) objSetter, float animD
 entity makeKeyframe(entity obj, void(entity, float) objSetter, float animDuration, float animStart, float animEnd)
 {
        entity me;
-       me = spawnKeyframe();
+       me = NEW(Keyframe);
        me.configureAnimation(me, obj, objSetter, time, animDuration, animStart, animEnd);
        return me;
 }
index d0bd40b03884c30d4e83c6727e82d89ac23019a3..73acad07e6d8365784e8d3d2e598ee52770d6c1b 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(Item) EXTENDS(Object)
+CLASS(ItemObject)
        METHOD(Item, draw, void(entity))
        METHOD(Item, keyDown, float(entity, float, float, float))
        METHOD(Item, keyUp, float(entity, float, float, float))
index e6affc1c03a848c93edbf95e9a9d1b6fe8fccaa8..422390a69426dba97449a555ac95fff0b35d20bc 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(BorderImage) EXTENDS(Label)
+CLASS(BorderImageLabel)
        METHOD(BorderImage, configureBorderImage, void(entity, string, float, vector, string, float))
        METHOD(BorderImage, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(BorderImage, recalcPositionWithText, void(entity, string))
index 52e58238c86916248549bfb6c87a917913705098..44a0ada9b0bf8d57454baf7b5aa5efa981323adf 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(Button) EXTENDS(Label)
+CLASS(ButtonLabel)
        METHOD(Button, configureButton, void(entity, string, float, string))
        METHOD(Button, draw, void(entity))
        METHOD(Button, showNotify, void(entity))
index 2540cc846fdbddf80ef44a5d8f4bd022e7f1dee8..56cf449bd4c28f8983b2cdb983ca88c122f73e82 100644 (file)
@@ -1,6 +1,6 @@
 #ifdef INTERFACE
 void CheckBox_Click(entity me, entity other);
-CLASS(CheckBox) EXTENDS(Button)
+CLASS(CheckBoxButton)
        METHOD(CheckBox, configureCheckBox, void(entity, string, float, string))
        METHOD(CheckBox, draw, void(entity))
        METHOD(CheckBox, playClickSound, void(entity))
index b4dda3e33a56b2bb060f63daf03d9976591ef211..b4c6fdc45c861379bdc3845e0c5188238bffaaab 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(Container) EXTENDS(Item)
+CLASS(ContainerItem)
        METHOD(Container, draw, void(entity))
        METHOD(Container, keyUp, float(entity, float, float, float))
        METHOD(Container, keyDown, float(entity, float, float, float))
index 1723f27cb8e5335691741ca3df38a883f3798e74..e68a0931d13882e0b7c2d51cb8c230eda7e159fb 100644 (file)
@@ -14,7 +14,7 @@
 // a subclass may help with using this as a tab
 
 #ifdef INTERFACE
-CLASS(Dialog) EXTENDS(InputContainer)
+CLASS(DialogInputContainer)
        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
        METHOD(Dialog, keyDown, float(entity, float, float, float))
@@ -128,7 +128,7 @@ void Dialog_configureDialog(entity me)
 {
        float absWidth, absHeight;
 
-       me.frame = spawnBorderImage();
+       me.frame = NEW(BorderImage);
        me.frame.configureBorderImage(me.frame, me.title, me.titleFontSize, me.color, me.backgroundImage, me.borderLines * me.titleHeight);
        me.frame.zoomedOutTitleBarPosition = me.zoomedOutTitleBarPosition;
        me.frame.zoomedOutTitleBar = me.zoomedOutTitleBar;
@@ -156,7 +156,7 @@ void Dialog_configureDialog(entity me)
        if(me.closable && me.borderLines > 0)
        {
                entity closebutton;
-               closebutton = me.closeButton = me.frame.closeButton = spawnButton();
+               closebutton = me.closeButton = me.frame.closeButton = NEW(Button);
                closebutton.configureButton(closebutton, "", 0, me.closeButtonImage);
                closebutton.onClick = Dialog_Close; closebutton.onClickEntity = me;
                closebutton.srcMulti = 0;
index b67df840cc7f8e58134592ee4332fdd04370c9d3..b78b6f589b58a7be088bd0b8a25dd344f2686be3 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(Image) EXTENDS(Item)
+CLASS(ImageItem)
        METHOD(Image, configureImage, void(entity, string))
        METHOD(Image, draw, void(entity))
        METHOD(Image, toString, string(entity))
index 275b20046def9e411a8211d231fc55a3117e162e..bb02fda71b8a7a4e16559d9d730e7bea3a693e40 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(InputBox) EXTENDS(Label)
+CLASS(InputBoxLabel)
        METHOD(InputBox, configureInputBox, void(entity, string, float, float, string))
        METHOD(InputBox, draw, void(entity))
        METHOD(InputBox, setText, void(entity, string))
index 8c09d1991be2a474eaa0e331918fce0ff3698307..7da569357d2dd37af9b4700b9dd1c184622d6dcb 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(InputContainer) EXTENDS(Container)
+CLASS(InputContainerContainer)
        METHOD(InputContainer, keyDown, float(entity, float, float, float))
        METHOD(InputContainer, mouseMove, float(entity, vector))
        METHOD(InputContainer, mousePress, float(entity, vector))
index a1769fc03d7ba5ed5235f99bbef65e5437cdc566..2e91ee15b725d230c396ecff4f2bb28f2c675155 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(Label) EXTENDS(Item)
+CLASS(LabelItem)
        METHOD(Label, configureLabel, void(entity, string, float, float))
        METHOD(Label, draw, void(entity))
        METHOD(Label, resizeNotify, void(entity, vector, vector, vector, vector))
index 478a2063ff74f71c7921d505134e0a1578ca500c..4623a5ffaad49c68a1720b60738106367caee9ed 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(ListBox) EXTENDS(Item)
+CLASS(ListBoxItem)
        METHOD(ListBox, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(ListBox, configureListBox, void(entity, float, float))
        METHOD(ListBox, draw, void(entity))
index 3ef656744568ad3b0ebfd25768e5acf3267fbfe5..228f7a51363a1d70749912b5ab2cf5c0e07dc0e9 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(ModalController) EXTENDS(Container)
+CLASS(ModalControllerContainer)
        METHOD(ModalController, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(ModalController, draw, void(entity))
        METHOD(ModalController, showChild, void(entity, entity, vector, vector, float))
index 1413039851ee7fcde86e3869d8778c9d2fc72614..b0d30cb1b5cf5bc44889238990d21a3d38512146 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(Nexposee) EXTENDS(Container)
+CLASS(NexposeeContainer)
        METHOD(Nexposee, draw, void(entity))
        METHOD(Nexposee, keyDown, float(entity, float, float, float))
        METHOD(Nexposee, keyUp, float(entity, float, float, float))
index 80fd5329b41f70f2dedab6ced75caea971e58284..97168fc53c8c135cb18730f3cff377f3cfa20d5d 100644 (file)
@@ -1,6 +1,6 @@
 #ifdef INTERFACE
 void RadioButton_Click(entity me, entity other);
-CLASS(RadioButton) EXTENDS(CheckBox)
+CLASS(RadioButtonCheckBox)
        METHOD(RadioButton, configureRadioButton, void(entity, string, float, string, float, float))
        ATTRIB(RadioButton, checked, float, 0)
        ATTRIB(RadioButton, group, float, 0)
index 2c74f6131c8f06e40e4a530bcb3720e2e2612613..b7605e4897dfb15a62811096cabd8a4474cdec54 100644 (file)
@@ -1,7 +1,7 @@
 // Note:
 //   to use this, you FIRST call configureSliderVisuals, then configureSliderValues
 #ifdef INTERFACE
-CLASS(Slider) EXTENDS(Label)
+CLASS(SliderLabel)
        METHOD(Slider, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(Slider, configureSliderVisuals, void(entity, float, float, float, string))
        METHOD(Slider, configureSliderValues, void(entity, float, float, float, float, float, float))
index 8cd72ba9c76a253b73001f2b1a32e3b95d23bf89..d5796c190425056dde86b168717c7ff755e4900d 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(Tab) EXTENDS(Dialog)
+CLASS(TabDialog)
        ATTRIB(Tab, isTabRoot, float, 0)
        ATTRIB(Tab, closable, float, 0)
        ATTRIB(Tab, rootDialog, float, 0)
index 93d4090e02f762e3c2269683e795fb4ba716204b..db8b55260e7149eab2c03e01150b2296b0a99f27 100644 (file)
@@ -1,7 +1,7 @@
 // Note:
 //   to use this, you FIRST call configureSliderVisuals, then multiple times addValue, then configureTextSlider
 #ifdef INTERFACE
-CLASS(TextSlider) EXTENDS(Slider)
+CLASS(TextSliderSlider)
        METHOD(TextSlider, valueToText, string(entity, float))
        METHOD(TextSlider, valueToIdentifier, string(entity, float))
        METHOD(TextSlider, setValueFromIdentifier, void(entity, string))
index a2c2c941320c1ff6dbb2bc80cc024b64b34c05fb..a8a3213f2a38584f94aed1b210308568e6aa048f 100644 (file)
@@ -211,8 +211,8 @@ void m_init_delayed()
        draw_setMousePointer(SKINGFX_CURSOR, SKINSIZE_CURSOR, SKINOFFSET_CURSOR);
 
        loadTooltips();
-       anim = spawnAnimHost();
-       main = spawnMainWindow(); main.configureMainWindow(main);
+       anim = NEW(AnimHost);
+       main = NEW(MainWindow); main.configureMainWindow(main);
        unloadTooltips();
 
        main.resizeNotify(main, '0 0 0', eX * conwidth + eY * conheight, '0 0 0', eX * conwidth + eY * conheight);
index 55af8adb84cfa4ddbba23e7eb60f4089be48a557..30423850e807a4bdd64909ecf2bc50ecb28bc7eb 100644 (file)
@@ -28,4 +28,7 @@ entity spawnObject()
                Object_vtbl = spawnVtbl(e, null_entity);
        return e;
 }
+
+#define NEW(cname) (spawn##cname())
+
 #endif
index d011523609983a597aaffe9486c0fe49a8b36522..78cba1ddb5abf407cc45e847cf33d0536ced7018 100644 (file)
@@ -8,7 +8,6 @@
 
 #ifdef CLASS
 #undef CLASS
-#undef EXTENDS
 #undef METHOD
 #undef ATTRIB
 #undef ATTRIBARRAY
@@ -17,8 +16,7 @@
 #endif
 
 // for the constructor
-#define CLASS(cname)                       entity spawn##cname() { entity me;
-#define EXTENDS(base)                      me = spawn##base (); entity basevtbl; basevtbl = base##_vtbl;
+#define CLASS(cname,base)                  entity spawn##cname() { entity me = spawn##base (); entity basevtbl; basevtbl = base##_vtbl;
 #define METHOD(cname,name,prototype)       me.name = cname##_##name;
 #define ATTRIB(cname,name,type,val)        me.name = val;
 #define ATTRIBARRAY(cname,name,type,cnt)
index 50485bc549fdc6ab15e15837cc8b6f52f11f1a79..5062045f5950f452ec32c4094d1a20db9f4b8c61 100644 (file)
@@ -8,7 +8,6 @@
 
 #ifdef CLASS
 #undef CLASS
-#undef EXTENDS
 #undef METHOD
 #undef ATTRIB
 #undef ATTRIBARRAY
@@ -16,8 +15,7 @@
 #undef SUPER
 #endif
 
-#define CLASS(cname)                       entity spawn##cname(); entity cname##_vtbl;
-#define EXTENDS(base)
+#define CLASS(cname,base)                  entity spawn##cname(); entity cname##_vtbl;
 #define METHOD(cname,name,prototype)       prototype cname##_##name; .prototype name;
 #define ATTRIB(cname,name,type,val)        .type name;
 #define ATTRIBARRAY(cname,name,type,cnt)   .type name[cnt];
index a63189b63a850dc326e46216e7429f5d80ba98cb..897d05d8df9bbe8faff3700ce35364e75df10543 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticBigButton) EXTENDS(XonoticButton)
+CLASS(XonoticBigButtonXonoticButton)
        METHOD(XonoticBigButton, configureXonoticBigButton, void(entity, string, vector))
        ATTRIB(XonoticBigButton, image, string, SKINGFX_BUTTON_BIG)
        ATTRIB(XonoticBigButton, grayImage, string, SKINGFX_BUTTON_BIG_GRAY)
@@ -11,7 +11,7 @@ entity makeXonoticButton(string theText, vector theColor);
 entity makeXonoticBigButton(string theText, vector theColor)
 {
        entity me;
-       me = spawnXonoticBigButton();
+       me = NEW(XonoticBigButton);
        me.configureXonoticBigButton(me, theText, theColor);
        return me;
 }
index c96dd57a16afcc614fedff7ce68d5a65b6076182..d7d203160c0a0b59e4936f9e621880ff8b2bf18b 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticBigCommandButton) EXTENDS(XonoticCommandButton)
+CLASS(XonoticBigCommandButtonXonoticCommandButton)
        METHOD(XonoticBigCommandButton, configureXonoticBigCommandButton, void(entity, string, vector, string, float))
        ATTRIB(XonoticBigCommandButton, image, string, SKINGFX_BUTTON_BIG)
        ATTRIB(XonoticBigCommandButton, grayImage, string, SKINGFX_BUTTON_BIG_GRAY)
@@ -11,7 +11,7 @@ entity makeXonoticBigCommandButton(string theText, vector theColor, string theCo
 entity makeXonoticBigCommandButton(string theText, vector theColor, string theCommand, float theFlags)
 {
        entity me;
-       me = spawnXonoticBigCommandButton();
+       me = NEW(XonoticBigCommandButton);
        me.configureXonoticBigCommandButton(me, theText, theColor, theCommand, theFlags);
        return me;
 }
index cbc7c47c40acbb84a88f39c154b7299428559531..99018cb2d695c3c492f4bc8bbecbf990bbb52f12 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticButton) EXTENDS(Button)
+CLASS(XonoticButtonButton)
        METHOD(XonoticButton, configureXonoticButton, void(entity, string, vector))
        ATTRIB(XonoticButton, fontSize, float, SKINFONTSIZE_NORMAL)
        ATTRIB(XonoticButton, image, string, SKINGFX_BUTTON)
@@ -20,7 +20,7 @@ entity makeXonoticButton(string theText, vector theColor);
 entity makeXonoticButton(string theText, vector theColor)
 {
        entity me;
-       me = spawnXonoticButton();
+       me = NEW(XonoticButton);
        me.configureXonoticButton(me, theText, theColor);
        return me;
 }
index 16967a688f8b915d047bd0ec6846ab087bb83fde..3ce8fa29ef4502233a2d2115bdd299848eb0fe42 100644 (file)
@@ -1,7 +1,7 @@
 #include "../../common/campaign_common.qh"
 
 #ifdef INTERFACE
-CLASS(XonoticCampaignList) EXTENDS(XonoticListBox)
+CLASS(XonoticCampaignListXonoticListBox)
        METHOD(XonoticCampaignList, configureXonoticCampaignList, void(entity))
        ATTRIB(XonoticCampaignList, rowsPerItem, float, 10)
        METHOD(XonoticCampaignList, draw, void(entity))
@@ -92,7 +92,7 @@ void rewrapCampaign(float w, float l0, float emptyheight, vector theFontSize)
 entity makeXonoticCampaignList()
 {
        entity me;
-       me = spawnXonoticCampaignList();
+       me = NEW(XonoticCampaignList);
        me.configureXonoticCampaignList(me);
        return me;
 }
index 0ba72a5d83404ff3fee24deb3d9d93aac7fccb36..06e4926dbdcbadea7320288e82665906dceaa80b 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticCharmap) EXTENDS(Item)
+CLASS(XonoticCharmapItem)
        METHOD(XonoticCharmap, configureXonoticCharmap, void(entity, entity))
        METHOD(XonoticCharmap, mousePress, float(entity, vector))
        METHOD(XonoticCharmap, mouseRelease, float(entity, vector))
@@ -57,7 +57,7 @@ string charmap_cellToChar(vector cell)
 entity makeXonoticCharmap(entity controlledInputBox)
 {
        entity me;
-       me = spawnXonoticCharmap();
+       me = NEW(XonoticCharmap);
        me.configureXonoticCharmap(me, controlledInputBox);
        return me;
 }
index 631a430dcc455947d8c63e83e0e24297ba5dd7ae..321bf7ebf47ffc9f40bd9d8cda1666e44de0c2ac 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticCheckBox) EXTENDS(CheckBox)
+CLASS(XonoticCheckBoxCheckBox)
        METHOD(XonoticCheckBox, configureXonoticCheckBox, void(entity, float, float, string, string))
        METHOD(XonoticCheckBox, setChecked, void(entity, float))
        ATTRIB(XonoticCheckBox, fontSize, float, SKINFONTSIZE_NORMAL)
@@ -53,7 +53,7 @@ entity makeXonoticCheckBox(float isInverted, string theCvar, string theText)
 entity makeXonoticCheckBoxEx(float theYesValue, float theNoValue, string theCvar, string theText)
 {
        entity me;
-       me = spawnXonoticCheckBox();
+       me = NEW(XonoticCheckBox);
        me.configureXonoticCheckBox(me, theYesValue, theNoValue, theCvar, theText);
        return me;
 }
index e3043184a44f35cd2676375466fff57ec9c91014..22cdf8b0bee50902af50add2997af954f9af1c9d 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticSliderCheckBox) EXTENDS(CheckBox)
+CLASS(XonoticSliderCheckBoxCheckBox)
        METHOD(XonoticSliderCheckBox, configureXonoticSliderCheckBox, void(entity, float, float, entity, string))
        METHOD(XonoticSliderCheckBox, setChecked, void(entity, float))
        METHOD(XonoticSliderCheckBox, draw, void(entity))
@@ -26,7 +26,7 @@ entity makeXonoticSliderCheckBox(float, float, entity, string);
 entity makeXonoticSliderCheckBox(float theOffValue, float isInverted, entity theControlledSlider, string theText)
 {
        entity me;
-       me = spawnXonoticSliderCheckBox();
+       me = NEW(XonoticSliderCheckBox);
        me.configureXonoticSliderCheckBox(me, theOffValue, isInverted, theControlledSlider, theText);
        return me;
 }
index aeda757f0e83718cbca511cace58aa2c9fc04d85..c36b710bf1301fff3b4b56018008bb15ad93c503 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticCheckBoxString) EXTENDS(CheckBox)
+CLASS(XonoticCheckBoxStringCheckBox)
        METHOD(XonoticCheckBoxString, configureXonoticCheckBoxString, void(entity, string, string, string, string))
        METHOD(XonoticCheckBoxString, setChecked, void(entity, float))
        ATTRIB(XonoticCheckBoxString, fontSize, float, SKINFONTSIZE_NORMAL)
@@ -27,7 +27,7 @@ entity makeXonoticCheckBoxString(string, string, string, string);
 entity makeXonoticCheckBoxString(string theYesValue, string theNoValue, string theCvar, string theText)
 {
        entity me;
-       me = spawnXonoticCheckBoxString();
+       me = NEW(XonoticCheckBoxString);
        me.configureXonoticCheckBoxString(me, theYesValue, theNoValue, theCvar, theText);
        return me;
 }
index bcbdfee8db9d3585a4aa4e51567492207cd392bc..527c0512e9cb293b8032ffaa99e0c0e94e57623f 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticColorButton) EXTENDS(RadioButton)
+CLASS(XonoticColorButtonRadioButton)
        METHOD(XonoticColorButton, configureXonoticColorButton, void(entity, float, float, float))
        METHOD(XonoticColorButton, setChecked, void(entity, float))
        METHOD(XonoticColorButton, draw, void(entity))
@@ -21,7 +21,7 @@ entity makeXonoticColorButton(float, float, float);
 entity makeXonoticColorButton(float theGroup, float theColor, float theValue)
 {
        entity me;
-       me = spawnXonoticColorButton();
+       me = NEW(XonoticColorButton);
        me.configureXonoticColorButton(me, theGroup, theColor, theValue);
        return me;
 }
index f16ab0ebd45fd0a16a0f941e06cfb9766941fe69..86da883a97830c3c736a77f95fc16ff52e989f67 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticColorpicker) EXTENDS(Image)
+CLASS(XonoticColorpickerImage)
        METHOD(XonoticColorpicker, configureXonoticColorpicker, void(entity, entity))
        METHOD(XonoticColorpicker, mousePress, float(entity, vector))
        METHOD(XonoticColorpicker, mouseRelease, float(entity, vector))
@@ -19,7 +19,7 @@ entity makeXonoticColorpicker(entity theTextbox);
 entity makeXonoticColorpicker(entity theTextbox)
 {
        entity me;
-       me = spawnXonoticColorpicker();
+       me = NEW(XonoticColorpicker);
        me.configureXonoticColorpicker(me, theTextbox);
        return me;
 }
index 458a72c01a6fe1dd47ced6e06c2dffb4ddfe41e3..4a5db88dff54f8d244597e5928cad6b2abb87710 100644 (file)
@@ -1,12 +1,12 @@
 #ifdef INTERFACE
-CLASS(XonoticColorpickerString) EXTENDS(Image)
+CLASS(XonoticColorpickerStringImage)
        METHOD(XonoticColorpickerString, configureXonoticColorpickerString, void(entity, string, string))
        METHOD(XonoticColorpickerString, mousePress, float(entity, vector))
        METHOD(XonoticColorpickerString, mouseRelease, float(entity, vector))
        METHOD(XonoticColorpickerString, mouseDrag, float(entity, vector))
        ATTRIB(XonoticColorpickerString, cvarName, string, string_null)
-       METHOD(XonoticColorPickerString, loadCvars, void(entity))
-       METHOD(XonoticColorPickerString, saveCvars, void(entity))
+       METHOD(XonoticColorpickerString, loadCvars, void(entity))
+       METHOD(XonoticColorpickerString, saveCvars, void(entity))
        ATTRIB(XonoticColorpickerString, prevcoords, vector, '0 0 0')
        ATTRIB(XonoticColorpickerString, image, string, SKINGFX_COLORPICKER)
        ATTRIB(XonoticColorpickerString, imagemargin, vector, SKINMARGIN_COLORPICKER)
@@ -21,7 +21,7 @@ entity makeXonoticColorpickerString(string theCvar, string theDefaultCvar);
 entity makeXonoticColorpickerString(string theCvar, string theDefaultCvar)
 {
        entity me;
-       me = spawnXonoticColorpickerString();
+       me = NEW(XonoticColorpickerString);
        me.configureXonoticColorpickerString(me, theCvar, theDefaultCvar);
        return me;
 }
@@ -38,7 +38,7 @@ void XonoticColorpickerString_configureXonoticColorpickerString(entity me, strin
        }
 }
 
-void XonoticColorPickerString_loadCvars(entity me)
+void XonoticColorpickerString_loadCvars(entity me)
 {
        if (!me.cvarName)
                return;
@@ -55,7 +55,7 @@ void XonoticColorPickerString_loadCvars(entity me)
                me.prevcoords = color_hslimage(stov(cvar_string(me.cvarName)), me.imagemargin);
 }
 
-void XonoticColorPickerString_saveCvars(entity me)
+void XonoticColorpickerString_saveCvars(entity me)
 {
        if (!me.cvarName)
                return;
index 8ee4e7de3a75503215591c49e643a68768c580bf..e0c17d55c60738d0173eb96cde8def83c6562e86 100644 (file)
@@ -5,7 +5,7 @@
 #endif
 
 #ifdef INTERFACE
-CLASS(XonoticCommandButton) EXTENDS(XonoticButton)
+CLASS(XonoticCommandButtonXonoticButton)
        METHOD(XonoticCommandButton, configureXonoticCommandButton, void(entity, string, vector, string, float))
        ATTRIB(XonoticCommandButton, onClickCommand, string, string_null)
        ATTRIB(XonoticCommandButton, flags, float, 0)
@@ -17,7 +17,7 @@ entity makeXonoticCommandButton(string theText, vector theColor, string theComma
 entity makeXonoticCommandButton(string theText, vector theColor, string theCommand, float theFlags)
 {
        entity me;
-       me = spawnXonoticCommandButton();
+       me = NEW(XonoticCommandButton);
        me.configureXonoticCommandButton(me, theText, theColor, theCommand, theFlags);
        return me;
 }
index 67848f9144978dd87bce3648aed4e65ed336c90b..c6f320bc95a20bd7c6a3f78cd24afa00e8173caa 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticCreditsList) EXTENDS(XonoticListBox)
+CLASS(XonoticCreditsListXonoticListBox)
        METHOD(XonoticCreditsList, configureXonoticCreditsList, void(entity))
        ATTRIB(XonoticCreditsList, rowsPerItem, float, 1)
        METHOD(XonoticCreditsList, draw, void(entity))
@@ -13,7 +13,7 @@ CLASS(XonoticCreditsList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticCreditsList, bufferIndex, float, 0)
        ATTRIB(XonoticCreditsList, scrolling, float, 0)
 
-       ATTRIB(XonoticListBox, alphaBG, float, 0)
+       ATTRIB(XonoticCreditsList, alphaBG, float, 0)
 ENDCLASS(XonoticCreditsList)
 entity makeXonoticCreditsList();
 #endif
@@ -22,7 +22,7 @@ entity makeXonoticCreditsList();
 entity makeXonoticCreditsList()
 {
        entity me;
-       me = spawnXonoticCreditsList();
+       me = NEW(XonoticCreditsList);
        me.configureXonoticCreditsList(me);
        return me;
 }
index 3b562cb776e4c3f8f2815c7046ccb1830f7d2d3b..4ed6352f923e8762b1466f93ec72e3c02356ee65 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticCrosshairButton) EXTENDS(RadioButton)
+CLASS(XonoticCrosshairButtonRadioButton)
        METHOD(XonoticCrosshairButton, configureXonoticCrosshairButton, void(entity, float, float))
        METHOD(XonoticCrosshairButton, setChecked, void(entity, float))
        METHOD(XonoticCrosshairButton, draw, void(entity))
@@ -22,7 +22,7 @@ entity makeXonoticCrosshairButton(float, float);
 entity makeXonoticCrosshairButton(float theGroup, float theCrosshair)
 {
        entity me;
-       me = spawnXonoticCrosshairButton();
+       me = NEW(XonoticCrosshairButton);
        me.configureXonoticCrosshairButton(me, theGroup, theCrosshair);
        return me;
 }
index 421142aac0746ca798ebe8157080071ee4254c79..a965f2cf961870010010eb27768c42a8b580239e 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticCvarList) EXTENDS(XonoticListBox)
+CLASS(XonoticCvarListXonoticListBox)
        METHOD(XonoticCvarList, configureXonoticCvarList, void(entity))
        ATTRIB(XonoticCvarList, rowsPerItem, float, 1)
        METHOD(XonoticCvarList, drawListBoxItem, void(entity, float, vector, float))
@@ -44,7 +44,7 @@ void CvarList_End_Editing(entity box, entity me);
 entity makeXonoticCvarList()
 {
        entity me;
-       me = spawnXonoticCvarList();
+       me = NEW(XonoticCvarList);
        me.configureXonoticCvarList(me);
        return me;
 }
index 6882fcc5eb78b2d49d6733639fd18b31b2298eea..170a4bba67211d3f0abe0438168edea6212de7aa 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticDemoList) EXTENDS(XonoticListBox)
+CLASS(XonoticDemoListXonoticListBox)
        METHOD(XonoticDemoList, configureXonoticDemoList, void(entity))
        ATTRIB(XonoticDemoList, rowsPerItem, float, 1)
        METHOD(XonoticDemoList, resizeNotify, void(entity, vector, vector, vector, vector))
@@ -38,7 +38,7 @@ void DemoList_Filter_Change(entity box, entity me);
 entity makeXonoticDemoList()
 {
        entity me;
-       me = spawnXonoticDemoList();
+       me = NEW(XonoticDemoList);
        me.configureXonoticDemoList(me);
        return me;
 }
index 6ca90254a3eb24b70318fe5972a58e85473cdfd0..3f6f30fc9384e911ee4677554fd978b301b45da9 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticDialog) EXTENDS(Dialog)
+CLASS(XonoticDialogDialog)
        // still to be customized by user
        /*
        ATTRIB(XonoticDialog, closable, float, 1)
index e90ae4b42590d08435472ea66b76c31e5a317fe4..ba8ddbba37303b93393b3eac339aaa0dc245d7ad 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticCreditsDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticCreditsDialogXonoticDialog)
        METHOD(XonoticCreditsDialog, fill, void(entity))
        METHOD(XonoticCreditsDialog, focusEnter, void(entity))
        ATTRIB(XonoticCreditsDialog, title, string, _("Credits"))
index c9238a979313f1086226ce5082b1e2c92038aaf5..444478e7301d834ccf5ffbdb8fbfd4c7070af75d 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticFirstRunDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticFirstRunDialogXonoticRootDialog)
        METHOD(XonoticFirstRunDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls
        ATTRIB(XonoticFirstRunDialog, title, string, _("Welcome"))
        ATTRIB(XonoticFirstRunDialog, color, vector, SKINCOLOR_DIALOG_FIRSTRUN)
index 307efdec023ea0a27c7eb5029290f668f8ad65ea..87db1efd865d57091efc0f610815ad0a146ec3b3 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDAmmoDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDAmmoDialogXonoticRootDialog)
        METHOD(XonoticHUDAmmoDialog, fill, void(entity))
        ATTRIB(XonoticHUDAmmoDialog, title, string, _("Ammo Panel"))
        ATTRIB(XonoticHUDAmmoDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index 226bd972403cafd7ba560c8984eabd5df2b24efc..14193b5ef8db8c3f0b376eac6e0c61dd608db93a 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDBuffsDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDBuffsDialogXonoticRootDialog)
        METHOD(XonoticHUDBuffsDialog, fill, void(entity))
        ATTRIB(XonoticHUDBuffsDialog, title, string, _("Buffs Panel"))
        ATTRIB(XonoticHUDBuffsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index bb7312f13e213002ecd65a4f2c07d2818c75e299..285754d862deb9145a6b7560fd8bc37ac350a958 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDCenterprintDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDCenterprintDialogXonoticRootDialog)
        METHOD(XonoticHUDCenterprintDialog, fill, void(entity))
        ATTRIB(XonoticHUDCenterprintDialog, title, string, _("Centerprint Panel"))
        ATTRIB(XonoticHUDCenterprintDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index e16f76ac3ea8d8f8022b1d8e2f8d1cde4ca5c19a..dd770163213111d9274418ec5c757597cf480cd2 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDChatDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDChatDialogXonoticRootDialog)
        METHOD(XonoticHUDChatDialog, fill, void(entity))
        ATTRIB(XonoticHUDChatDialog, title, string, _("Chat Panel"))
        ATTRIB(XonoticHUDChatDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index 534f1ebfe146da507f81f2fc1fea49e6278a3e59..ef314a4ff57d8da7e12c94d403636a48127356bd 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDEngineInfoDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDEngineInfoDialogXonoticRootDialog)
        METHOD(XonoticHUDEngineInfoDialog, fill, void(entity))
        ATTRIB(XonoticHUDEngineInfoDialog, title, string, _("Engine Info Panel"))
        ATTRIB(XonoticHUDEngineInfoDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index dc864203b46c0c7a1c0a54abe3925af18c5e357a..f5656fa487b39bfaf02b54450f7339079c2e4fd5 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDHealthArmorDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDHealthArmorDialogXonoticRootDialog)
        METHOD(XonoticHUDHealthArmorDialog, fill, void(entity))
        ATTRIB(XonoticHUDHealthArmorDialog, title, string, _("Health/Armor Panel"))
        ATTRIB(XonoticHUDHealthArmorDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index b705531209bda727d8f066e9cac3a810858fb485..e25ce9a42ad974d516e2fd2ae23b3298f8b10a2b 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDInfoMessagesDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDInfoMessagesDialogXonoticRootDialog)
        METHOD(XonoticHUDInfoMessagesDialog, fill, void(entity))
        ATTRIB(XonoticHUDInfoMessagesDialog, title, string, _("Info Messages Panel"))
        ATTRIB(XonoticHUDInfoMessagesDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index 3133a7e83a1228651c4e6b512ef35ab057105d36..05e06054eb293c2366f493456a39330fa6fab707 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDModIconsDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDModIconsDialogXonoticRootDialog)
        METHOD(XonoticHUDModIconsDialog, fill, void(entity))
        ATTRIB(XonoticHUDModIconsDialog, title, string, _("Mod Icons Panel"))
        ATTRIB(XonoticHUDModIconsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index 722b5d539d169de9e9ca106279e7f341f129c0b4..f5518508c444600af7cfa0da3ab0af36567600d1 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDNotificationDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDNotificationDialogXonoticRootDialog)
        METHOD(XonoticHUDNotificationDialog, fill, void(entity))
        ATTRIB(XonoticHUDNotificationDialog, title, string, _("Notification Panel"))
        ATTRIB(XonoticHUDNotificationDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index 6e4917d93c0f8bb75be6906680c94c54d2faae28..f6120dac3cc5d3d68c742bf715a1a9c5262a1376 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDPhysicsDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDPhysicsDialogXonoticRootDialog)
        METHOD(XonoticHUDPhysicsDialog, fill, void(entity))
        ATTRIB(XonoticHUDPhysicsDialog, title, string, _("Physics Panel"))
        ATTRIB(XonoticHUDPhysicsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index 3449e0604a046ffa0ddac263a988770c82fad713..d97277142553aec426613096c035840a9173ab6c 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDPowerupsDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDPowerupsDialogXonoticRootDialog)
        METHOD(XonoticHUDPowerupsDialog, fill, void(entity))
        ATTRIB(XonoticHUDPowerupsDialog, title, string, _("Powerups Panel"))
        ATTRIB(XonoticHUDPowerupsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index 79f581d13456f2f5bb93fd34ca5d324137375254..0d025c9691faa4ac404c086a2fcf94ea5d57bf44 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDPressedKeysDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDPressedKeysDialogXonoticRootDialog)
        METHOD(XonoticHUDPressedKeysDialog, fill, void(entity))
        ATTRIB(XonoticHUDPressedKeysDialog, title, string, _("Pressed Keys Panel"))
        ATTRIB(XonoticHUDPressedKeysDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index b8ecbee59bcb49bd555eb636e6294d5c59801217..1515a3365b0c9b816b42c46d54856a12fd6bb7f9 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDRaceTimerDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDRaceTimerDialogXonoticRootDialog)
        METHOD(XonoticHUDRaceTimerDialog, fill, void(entity))
        ATTRIB(XonoticHUDRaceTimerDialog, title, string, _("Race Timer Panel"))
        ATTRIB(XonoticHUDRaceTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index bdff50cb5ec915e270a37e38ac4bb96892377959..9e3eac3cfc73d43ef6aa8f7b9f8ef1f13fec998c 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDRadarDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDRadarDialogXonoticRootDialog)
        METHOD(XonoticHUDRadarDialog, fill, void(entity))
        ATTRIB(XonoticHUDRadarDialog, title, string, _("Radar Panel"))
        ATTRIB(XonoticHUDRadarDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index edd4da66e0cb9654b326ec9e185fbee29206d4c8..95a53daa5eb5ada9ca279cb16167b0a48ff4f9c7 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDScoreDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDScoreDialogXonoticRootDialog)
        METHOD(XonoticHUDScoreDialog, fill, void(entity))
        ATTRIB(XonoticHUDScoreDialog, title, string, _("Score Panel"))
        ATTRIB(XonoticHUDScoreDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index 754a5f1003481dfe06d65cf3dfa5c5c7f84a6269..7b7d60b0f18006a63585364dce3e0b80afc4d214 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDTimerDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDTimerDialogXonoticRootDialog)
        METHOD(XonoticHUDTimerDialog, fill, void(entity))
        ATTRIB(XonoticHUDTimerDialog, title, string, _("Timer Panel"))
        ATTRIB(XonoticHUDTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index e2b398ef2ed2e839dda0c74ac11e4812b1be73d5..31ba3b550477896c99dbfca055aca031e85af30a 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDVoteDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDVoteDialogXonoticRootDialog)
        METHOD(XonoticHUDVoteDialog, fill, void(entity))
        ATTRIB(XonoticHUDVoteDialog, title, string, _("Vote Panel"))
        ATTRIB(XonoticHUDVoteDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index ce1479cb1d775da4681ec211f58a7f8d2a7371ed..4164005c572fe4ea15b49f0dcdcffa5a68d661b0 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDWeaponsDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDWeaponsDialogXonoticRootDialog)
        METHOD(XonoticHUDWeaponsDialog, fill, void(entity))
        ATTRIB(XonoticHUDWeaponsDialog, title, string, _("Weapons Panel"))
        ATTRIB(XonoticHUDWeaponsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index 7cf0ea6dab934c6e8d5b6b125e60e3d88688c966..249855cada50b682f956cbb797679b7d0cfd476a 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDExitDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticHUDExitDialogXonoticRootDialog)
        METHOD(XonoticHUDExitDialog, fill, void(entity))
        ATTRIB(XonoticHUDExitDialog, title, string, _("Panel HUD Setup"))
        ATTRIB(XonoticHUDExitDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
index 8b67094a725a945be5ef7ec5fc4f3215edda6441..c288585a5c920e627eb66c88a438ffe601107b00 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticMonsterToolsDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticMonsterToolsDialogXonoticRootDialog)
        METHOD(XonoticMonsterToolsDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls
        ATTRIB(XonoticMonsterToolsDialog, title, string, _("Monster Tools"))
        ATTRIB(XonoticMonsterToolsDialog, color, vector, SKINCOLOR_DIALOG_SANDBOXTOOLS)
index 7d234c7fe84907a024e1de737d5b73810f0014d0..d284041c598aa07685badf48ce3c77f7ac58e636 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticMultiplayerDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticMultiplayerDialogXonoticDialog)
        METHOD(XonoticMultiplayerDialog, fill, void(entity))
        ATTRIB(XonoticMultiplayerDialog, title, string, _("Multiplayer"))
        ATTRIB(XonoticMultiplayerDialog, color, vector, SKINCOLOR_DIALOG_MULTIPLAYER)
index d49cd3765ca5957a5f35ed17364ddc74fe2d63ad..84ce8a1ab5662f8aedb9b46c9f3577ed32566fa1 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticServerCreateTab) EXTENDS(XonoticTab)
+CLASS(XonoticServerCreateTabXonoticTab)
        METHOD(XonoticServerCreateTab, fill, void(entity))
        METHOD(XonoticServerCreateTab, gameTypeChangeNotify, void(entity))
        METHOD(XonoticServerCreateTab, gameTypeSelectNotify, void(entity))
@@ -56,7 +56,7 @@ void GameType_ConfigureSliders(entity e, entity l, string pLabel, float pMin, fl
 entity makeXonoticServerCreateTab()
 {
        entity me;
-       me = spawnXonoticServerCreateTab();
+       me = NEW(XonoticServerCreateTab);
        me.configureDialog(me);
        return me;
 }
index 90cbcac0dbbd40910e6203702ff8ed825252a029..ab6f42834025d5d3b53015e849b671cb0d0a4c24 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticMapInfoDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticMapInfoDialogXonoticDialog)
        METHOD(XonoticMapInfoDialog, fill, void(entity))
        METHOD(XonoticMapInfoDialog, loadMapInfo, void(entity, float, entity))
        ATTRIB(XonoticMapInfoDialog, title, string, _("Map Information"))
index d7825e06a395705cdac822d833107c6943a488fc..9ac61ec28f88db4ffebddbf1fc59bff25cae920b 100644 (file)
@@ -1,7 +1,7 @@
 #include "../../common/weapons/weapons.qh"
 
 #ifdef INTERFACE
-CLASS(XonoticMutatorsDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticMutatorsDialogXonoticDialog)
        METHOD(XonoticMutatorsDialog, toString, string(entity))
        METHOD(XonoticMutatorsDialog, fill, void(entity))
        METHOD(XonoticMutatorsDialog, showNotify, void(entity))
index 4636ebbdbbfe3321e25b1a2f7a18b246e414849c..76b1e064ac93544031748b3ef4273af4482085f5 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticServerListTab) EXTENDS(XonoticTab)
+CLASS(XonoticServerListTabXonoticTab)
        METHOD(XonoticServerListTab, fill, void(entity))
        ATTRIB(XonoticServerListTab, title, string, _("Join"))
        ATTRIB(XonoticServerListTab, intendedWidth, float, 0.9)
@@ -14,7 +14,7 @@ entity makeXonoticServerListTab();
 entity makeXonoticServerListTab()
 {
        entity me;
-       me = spawnXonoticServerListTab();
+       me = NEW(XonoticServerListTab);
        me.configureDialog(me);
        return me;
 }
index dabb1be541bf3b50131d7ef827e61dc9aae7d890..74b8df6a6c8f6deee6e8f58999c25fa83e29227e 100644 (file)
@@ -1,7 +1,7 @@
 #include "../../common/mapinfo.qh"
 
 #ifdef INTERFACE
-CLASS(XonoticServerInfoDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticServerInfoDialogXonoticDialog)
        METHOD(XonoticServerInfoDialog, fill, void(entity))
        METHOD(XonoticServerInfoDialog, loadServerInfo, void(entity, float))
        ATTRIB(XonoticServerInfoDialog, title, string, _("Server Information"))
index 1ec0c76e9e7b35fff87ed408a40de939a55d0b57..c17fdd75dc6908ebe2e1bc10c8f0f99437dedffe 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticMediaTab) EXTENDS(XonoticTab)
+CLASS(XonoticMediaTabXonoticTab)
        METHOD(XonoticMediaTab, fill, void(entity))
        ATTRIB(XonoticMediaTab, title, string, _("Media"))
        ATTRIB(XonoticMediaTab, intendedWidth, float, 0.9)
@@ -14,7 +14,7 @@ entity makeXonoticMediaTab();
 entity makeXonoticMediaTab()
 {
        entity me;
-       me = spawnXonoticMediaTab();
+       me = NEW(XonoticMediaTab);
        me.configureDialog(me);
        return me;
 }
index ab2886a28542f66987de95c3ba02ea108ee38cb1..e79885e64988651cd2a8466435ee6a2e1dd61c5f 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticDemoBrowserTab) EXTENDS(XonoticTab)
+CLASS(XonoticDemoBrowserTabXonoticTab)
        METHOD(XonoticDemoBrowserTab, fill, void(entity))
        ATTRIB(XonoticDemoBrowserTab, title, string, _("Demo"))
        ATTRIB(XonoticDemoBrowserTab, intendedWidth, float, 0.9)
@@ -38,7 +38,7 @@ void DemoConfirm_Check_Gamestatus(entity btn, entity me)
 entity makeXonoticDemoBrowserTab()
 {
        entity me;
-       me = spawnXonoticDemoBrowserTab();
+       me = NEW(XonoticDemoBrowserTab);
        me.configureDialog(me);
        return me;
 }
index 136997eec0afae2a1b2451d1b5eb5d8e6af68e6f..7fa2072deeeb2b2a675373b7310d46a46f2eea64 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticDemoStartConfirmDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticDemoStartConfirmDialogXonoticDialog)
        METHOD(XonoticDemoStartConfirmDialog, fill, void(entity))
        ATTRIB(XonoticDemoStartConfirmDialog, title, string, _("Disconnect"))
        ATTRIB(XonoticDemoStartConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM)
index 5c9bf8cb3d12ba9d6b633d1f1cd8cf27448728f8..d71ad6f2eca2cc53fccea1740a31e3ba7e985d42 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticDemoTimeConfirmDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticDemoTimeConfirmDialogXonoticDialog)
        METHOD(XonoticDemoTimeConfirmDialog, fill, void(entity))
        ATTRIB(XonoticDemoTimeConfirmDialog, title, string, _("Disconnect"))
        ATTRIB(XonoticDemoTimeConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM)
index 0b7e4231ce50e4c1742e79d17fbcf714145d228f..ddb83e0a34a8a20736c3e356de6c833aaa78860b 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticMusicPlayerTab) EXTENDS(XonoticTab)
+CLASS(XonoticMusicPlayerTabXonoticTab)
        METHOD(XonoticMusicPlayerTab, fill, void(entity))
        ATTRIB(XonoticMusicPlayerTab, title, string, _("Music"))
        ATTRIB(XonoticMusicPlayerTab, intendedWidth, float, 0.9)
@@ -14,7 +14,7 @@ entity makeXonoticMusicPlayerTab();
 entity makeXonoticMusicPlayerTab()
 {
        entity me;
-       me = spawnXonoticMusicPlayerTab();
+       me = NEW(XonoticMusicPlayerTab);
        me.configureDialog(me);
        return me;
 }
index 89a76b608dce46dcb73c662188a790298b15f749..f072645a9573897972b2d1f09aa33f7a7bf0f6d1 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticScreenshotBrowserTab) EXTENDS(XonoticTab)
+CLASS(XonoticScreenshotBrowserTabXonoticTab)
        METHOD(XonoticScreenshotBrowserTab, fill, void(entity))
        ATTRIB(XonoticScreenshotBrowserTab, title, string, "Screenshot")
        ATTRIB(XonoticScreenshotBrowserTab, intendedWidth, float, 1)
@@ -18,7 +18,7 @@ entity makeXonoticScreenshotBrowserTab();
 entity makeXonoticScreenshotBrowserTab()
 {
        entity me;
-       me = spawnXonoticScreenshotBrowserTab();
+       me = NEW(XonoticScreenshotBrowserTab);
        me.configureDialog(me);
        return me;
 }
index bcf168a93a3036da416233dd427d6027d2df0eca..dd47da81162e945af8867306fa02c9e34bd051e7 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticScreenshotViewerDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticScreenshotViewerDialogXonoticDialog)
        METHOD(XonoticScreenshotViewerDialog, fill, void(entity))
        METHOD(XonoticScreenshotViewerDialog, keyDown, float(entity, float, float, float))
        METHOD(XonoticScreenshotViewerDialog, loadScreenshot, void(entity, string))
index 8c24885439e8ec9b16ac9aff2837f032fc0289dd..8c6fc8025e46d9ab75ea653ab167bdc0b2096b49 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticProfileTab) EXTENDS(XonoticTab)
+CLASS(XonoticProfileTabXonoticTab)
        METHOD(XonoticProfileTab, fill, void(entity))
        METHOD(XonoticProfileTab, draw, void(entity))
        ATTRIB(XonoticProfileTab, title, string, _("Profile"))
@@ -16,7 +16,7 @@ entity makeXonoticProfileTab();
 entity makeXonoticProfileTab()
 {
        entity me;
-       me = spawnXonoticProfileTab();
+       me = NEW(XonoticProfileTab);
        me.configureDialog(me);
        return me;
 }
index 71de59dac2e33166fb3479d29655656498a8089c..3c4013d956053a639c8b902a35cf4dbd05b44edd 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticQuitDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticQuitDialogXonoticDialog)
        METHOD(XonoticQuitDialog, fill, void(entity))
        ATTRIB(XonoticQuitDialog, title, string, _("Quit"))
        ATTRIB(XonoticQuitDialog, color, vector, SKINCOLOR_DIALOG_QUIT)
index fa7f40aea11911cdbf41db33b354c2e9e24d7e33..30a353704dd9f177ddf107894d7d782db0c329c9 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticSandboxToolsDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticSandboxToolsDialogXonoticRootDialog)
        METHOD(XonoticSandboxToolsDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls
        ATTRIB(XonoticSandboxToolsDialog, title, string, _("Sandbox Tools")) // ;)
        ATTRIB(XonoticSandboxToolsDialog, color, vector, SKINCOLOR_DIALOG_SANDBOXTOOLS)
index a992e80593e4b14b62b86aa96f683f5d4df4695e..16e00f7ebd79f2dd28c8c748434638f92e42ac8c 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticSettingsDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticSettingsDialogXonoticDialog)
        METHOD(XonoticSettingsDialog, fill, void(entity))
        ATTRIB(XonoticSettingsDialog, title, string, _("Settings"))
        ATTRIB(XonoticSettingsDialog, color, vector, SKINCOLOR_DIALOG_SETTINGS)
index cccaa2652818b5bbf91dc9bfe9c204a33f85bdcf..2245edbd41dc772099d37de7510cd3194e776a2c 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticAudioSettingsTab) EXTENDS(XonoticTab)
+CLASS(XonoticAudioSettingsTabXonoticTab)
        METHOD(XonoticAudioSettingsTab, fill, void(entity))
        ATTRIB(XonoticAudioSettingsTab, title, string, _("Audio"))
        ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9)
@@ -14,7 +14,7 @@ entity makeXonoticAudioSettingsTab();
 entity makeXonoticAudioSettingsTab()
 {
        entity me;
-       me = spawnXonoticAudioSettingsTab();
+       me = NEW(XonoticAudioSettingsTab);
        me.configureDialog(me);
        return me;
 }
index fcbbbbe0e19b6a740576762a673d725b16e21bd4..109dd2763c2bec75e55d0f2dad0e0725474baaeb 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticEffectsSettingsTab) EXTENDS(XonoticTab)
+CLASS(XonoticEffectsSettingsTabXonoticTab)
        METHOD(XonoticEffectsSettingsTab, fill, void(entity))
        ATTRIB(XonoticEffectsSettingsTab, title, string, _("Effects"))
        ATTRIB(XonoticEffectsSettingsTab, intendedWidth, float, 0.9)
@@ -13,7 +13,7 @@ entity makeXonoticEffectsSettingsTab();
 entity makeXonoticEffectsSettingsTab()
 {
        entity me;
-       me = spawnXonoticEffectsSettingsTab();
+       me = NEW(XonoticEffectsSettingsTab);
        me.configureDialog(me);
        return me;
 }
index 5fb563ebd7be2243e3092c01fd6f29c431411d2f..d2db0ab06d0f60e8894df20a22dc051c8cc3c43e 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticGameSettingsTab) EXTENDS(XonoticTab)
+CLASS(XonoticGameSettingsTabXonoticTab)
        METHOD(XonoticGameSettingsTab, fill, void(entity))
        ATTRIB(XonoticGameSettingsTab, title, string, _("Game"))
        ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9)
@@ -13,7 +13,7 @@ entity makeXonoticGameSettingsTab();
 entity makeXonoticGameSettingsTab()
 {
        entity me;
-       me = spawnXonoticGameSettingsTab();
+       me = NEW(XonoticGameSettingsTab);
        me.configureDialog(me);
        return me;
 }
index 28cf3708f3af0833b98028ef9b42e433a934292c..b51f61b9a5596c0a009e66a939b04624a4aabe8e 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticGameCrosshairSettingsTab) EXTENDS(XonoticTab)
+CLASS(XonoticGameCrosshairSettingsTabXonoticTab)
        //METHOD(XonoticGameCrosshairSettingsTab, toString, string(entity))
        METHOD(XonoticGameCrosshairSettingsTab, fill, void(entity))
        METHOD(XonoticGameCrosshairSettingsTab, showNotify, void(entity))
@@ -19,7 +19,7 @@ void XonoticGameCrosshairSettingsTab_showNotify(entity me)
 entity makeXonoticGameCrosshairSettingsTab()
 {
        entity me;
-       me = spawnXonoticGameCrosshairSettingsTab();
+       me = NEW(XonoticGameCrosshairSettingsTab);
        me.configureDialog(me);
        return me;
 }
index bb0587184be7b6ca1491c4cc2730a3eb9831091a..7489207a1b4afebb3a602a8aed2293ff12e44426 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticGameHUDSettingsTab) EXTENDS(XonoticTab)
+CLASS(XonoticGameHUDSettingsTabXonoticTab)
        //METHOD(XonoticGameHUDSettingsTab, toString, string(entity))
        METHOD(XonoticGameHUDSettingsTab, fill, void(entity))
        METHOD(XonoticGameHUDSettingsTab, showNotify, void(entity))
@@ -31,7 +31,7 @@ void XonoticGameHUDSettingsTab_showNotify(entity me)
 entity makeXonoticGameHUDSettingsTab()
 {
        entity me;
-       me = spawnXonoticGameHUDSettingsTab();
+       me = NEW(XonoticGameHUDSettingsTab);
        me.configureDialog(me);
        return me;
 }
index 12312c36bbe7b6b4e1e27caf235d0931fab69171..9bf5130ab4eedd041b50255ea8c79da0af57efc0 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticHUDConfirmDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticHUDConfirmDialogXonoticDialog)
        METHOD(XonoticHUDConfirmDialog, fill, void(entity))
        ATTRIB(XonoticHUDConfirmDialog, title, string, _("Enter HUD editor"))
        ATTRIB(XonoticHUDConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM)
index 034608d096d396ca59142133ff54018ef5c9b62f..1c2ee73f5f5cd197895fef07aa56a5ee0ba0f08b 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticGameMessageSettingsTab) EXTENDS(XonoticTab)
+CLASS(XonoticGameMessageSettingsTabXonoticTab)
        //METHOD(XonoticGameWeaponsSettingsTab, toString, string(entity))
        METHOD(XonoticGameMessageSettingsTab, fill, void(entity))
        METHOD(XonoticGameMessageSettingsTab, showNotify, void(entity))
@@ -20,7 +20,7 @@ void XonoticGameMessageSettingsTab_showNotify(entity me)
 entity makeXonoticGameMessageSettingsTab()
 {
        entity me;
-       me = spawnXonoticGameMessageSettingsTab();
+       me = NEW(XonoticGameMessageSettingsTab);
        me.configureDialog(me);
        return me;
 }
index 1f9a23f2e488c852b25073a943cfdf28ac6020d3..404215e30b880ad341830f8e3c8157df0163ce74 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticGameModelSettingsTab) EXTENDS(XonoticTab)
+CLASS(XonoticGameModelSettingsTabXonoticTab)
        //METHOD(XonoticGameModelSettingsTab, toString, string(entity))
        METHOD(XonoticGameModelSettingsTab, fill, void(entity))
        METHOD(XonoticGameModelSettingsTab, showNotify, void(entity))
@@ -19,7 +19,7 @@ void XonoticGameModelSettingsTab_showNotify(entity me)
 entity makeXonoticGameModelSettingsTab()
 {
        entity me;
-       me = spawnXonoticGameModelSettingsTab();
+       me = NEW(XonoticGameModelSettingsTab);
        me.configureDialog(me);
        return me;
 }
index 44e741934ce1348892e7f22ae42dd5f1933a9e81..b0938009284bab1249c7361f45e1ba370eba2766 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticGameViewSettingsTab) EXTENDS(XonoticTab)
+CLASS(XonoticGameViewSettingsTabXonoticTab)
        //METHOD(XonoticGameCrosshairSettingsTab, toString, string(entity))
        METHOD(XonoticGameViewSettingsTab, fill, void(entity))
        METHOD(XonoticGameViewSettingsTab, showNotify, void(entity))
@@ -19,7 +19,7 @@ void XonoticGameViewSettingsTab_showNotify(entity me)
 entity makeXonoticGameViewSettingsTab()
 {
        entity me;
-       me = spawnXonoticGameViewSettingsTab();
+       me = NEW(XonoticGameViewSettingsTab);
        me.configureDialog(me);
        return me;
 }
index bc7cc7d7ff554d2aa56893dc56e08e19f136a1b1..739c186b11a473d60b6c76e4d88621de17b5eddc 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticGameWeaponsSettingsTab) EXTENDS(XonoticTab)
+CLASS(XonoticGameWeaponsSettingsTabXonoticTab)
        //METHOD(XonoticGameWeaponsSettingsTab, toString, string(entity))
        METHOD(XonoticGameWeaponsSettingsTab, fill, void(entity))
        METHOD(XonoticGameWeaponsSettingsTab, showNotify, void(entity))
@@ -20,7 +20,7 @@ void XonoticGameWeaponsSettingsTab_showNotify(entity me)
 entity makeXonoticGameWeaponsSettingsTab()
 {
        entity me;
-       me = spawnXonoticGameWeaponsSettingsTab();
+       me = NEW(XonoticGameWeaponsSettingsTab);
        me.configureDialog(me);
        return me;
 }
index b4ac6134834ba254d571ed93db991eede16e8bfd..90cc13484228fa110d131ea8e5936c5b414132bd 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticInputSettingsTab) EXTENDS(XonoticTab)
+CLASS(XonoticInputSettingsTabXonoticTab)
        METHOD(XonoticInputSettingsTab, fill, void(entity))
        ATTRIB(XonoticInputSettingsTab, title, string, _("Input"))
        ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9)
@@ -13,7 +13,7 @@ entity makeXonoticInputSettingsTab();
 entity makeXonoticInputSettingsTab()
 {
        entity me;
-       me = spawnXonoticInputSettingsTab();
+       me = NEW(XonoticInputSettingsTab);
        me.configureDialog(me);
        return me;
 }
index aaf182fcd80e93a92e15ca4ca5af48ae27481534..4bc26b2e449bd0198a06e5d031ccf3cbbcd17cc7 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticUserbindEditDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticUserbindEditDialogXonoticDialog)
        METHOD(XonoticUserbindEditDialog, loadUserBind, void(entity, string, string, string))
        METHOD(XonoticUserbindEditDialog, fill, void(entity))
        ATTRIB(XonoticUserbindEditDialog, title, string, _("User defined key bind"))
index 2ea9c1e9c263418960a277dbd04563f0fb351501..2372e320843e5e85ecaad913ef96edd6ab17e719 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticMiscSettingsTab) EXTENDS(XonoticTab)
+CLASS(XonoticMiscSettingsTabXonoticTab)
        METHOD(XonoticMiscSettingsTab, fill, void(entity))
        ATTRIB(XonoticMiscSettingsTab, title, string, _("Misc"))
        ATTRIB(XonoticMiscSettingsTab, intendedWidth, float, 0.9)
@@ -13,7 +13,7 @@ entity makeXonoticMiscSettingsTab();
 entity makeXonoticMiscSettingsTab()
 {
        entity me;
-       me = spawnXonoticMiscSettingsTab();
+       me = NEW(XonoticMiscSettingsTab);
        me.configureDialog(me);
        return me;
 }
index c2ea2a5b66167c8dfc366bd8361ba0238a7e9c22..2993fa30e3ef700ec494536ecebfdbbe79c131c5 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticCvarsDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticCvarsDialogXonoticDialog)
        METHOD(XonoticCvarsDialog, fill, void(entity))
        METHOD(XonoticCvarsDialog, showNotify, void(entity))
        ATTRIB(XonoticCvarsDialog, title, string, _("Advanced settings"))
index 8f6da0a55207b6b4c69426670ffddfa6b12d61ec..19a87435406c2841bef137444adcca76fb90bda9 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticResetDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticResetDialogXonoticDialog)
        METHOD(XonoticResetDialog, fill, void(entity))
        ATTRIB(XonoticResetDialog, title, string, _("Factory reset"))
        ATTRIB(XonoticResetDialog, color, vector, SKINCOLOR_DIALOG_QUIT)
index 180efccb9bdd323ba86ef8cedc490175e46cd233..9e2b0d034c1b3fe4ea1c156368b15dabe94a9b0f 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticUserSettingsTab) EXTENDS(XonoticTab)
+CLASS(XonoticUserSettingsTabXonoticTab)
        METHOD(XonoticUserSettingsTab, fill, void(entity))
        ATTRIB(XonoticUserSettingsTab, title, string, _("User"))
        ATTRIB(XonoticUserSettingsTab, intendedWidth, float, 0.9)
@@ -13,7 +13,7 @@ entity makeXonoticUserSettingsTab();
 entity makeXonoticUserSettingsTab()
 {
        entity me;
-       me = spawnXonoticUserSettingsTab();
+       me = NEW(XonoticUserSettingsTab);
        me.configureDialog(me);
        return me;
 }
index c830b5583a04615e72f72ffe739784ea29ae16e3..24644c0ac3752b5dbacdde7fbb4c6d576819c6ab 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticLanguageWarningDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticLanguageWarningDialogXonoticDialog)
        METHOD(XonoticLanguageWarningDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls
        ATTRIB(XonoticLanguageWarningDialog, title, string, _("Warning"))
        ATTRIB(XonoticLanguageWarningDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM)
index 36929cbd716a669170fb8cd06903ba214e05a69b..7a22cf4a8622d015ca7606524bd816120e152c1c 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticVideoSettingsTab) EXTENDS(XonoticTab)
+CLASS(XonoticVideoSettingsTabXonoticTab)
        METHOD(XonoticVideoSettingsTab, fill, void(entity))
        ATTRIB(XonoticVideoSettingsTab, title, string, _("Video"))
        ATTRIB(XonoticVideoSettingsTab, intendedWidth, float, 0.9)
@@ -14,7 +14,7 @@ entity makeXonoticVideoSettingsTab();
 entity makeXonoticVideoSettingsTab()
 {
        entity me;
-       me = spawnXonoticVideoSettingsTab();
+       me = NEW(XonoticVideoSettingsTab);
        me.configureDialog(me);
        return me;
 }
index 6e13f65b818ea6cb348a1d47a744e43072d33299..978e3adc3f6231ae45c93153a219aef4215ab780 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticSingleplayerDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticSingleplayerDialogXonoticDialog)
        METHOD(XonoticSingleplayerDialog, fill, void(entity))
        ATTRIB(XonoticSingleplayerDialog, title, string, _("Singleplayer"))
        ATTRIB(XonoticSingleplayerDialog, color, vector, SKINCOLOR_DIALOG_SINGLEPLAYER)
index 0d1c05af44a10a89281bc4c668d06dd1827608ba..275cc04337e81513de36a84cd766c4804910ed9c 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticWinnerDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticWinnerDialogXonoticDialog)
        METHOD(XonoticWinnerDialog, fill, void(entity))
        METHOD(XonoticWinnerDialog, focusEnter, void(entity))
        ATTRIB(XonoticWinnerDialog, title, string, _("Winner"))
index 1ab68c3fbe34cf16416325451690cf34542d58d3..cab938185d2d364e52653d53fbec79e84a2ef5e5 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticTeamSelectDialog) EXTENDS(XonoticRootDialog)
+CLASS(XonoticTeamSelectDialogXonoticRootDialog)
        METHOD(XonoticTeamSelectDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls
        METHOD(XonoticTeamSelectDialog, showNotify, void(entity))
        ATTRIB(XonoticTeamSelectDialog, title, string, _("Team Selection")) // ;)
index cc10f3da9ea5d722627ab283f2a4d6ab83d06dbc..aaa46eaf7b54dfab2b11a42bd51511f157446083 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticGametypeButton) EXTENDS(RadioButton)
+CLASS(XonoticGametypeButtonRadioButton)
        METHOD(XonoticGametypeButton, configureXonoticGametypeButton, void(entity, float, string, string))
        METHOD(XonoticGametypeButton, setChecked, void(entity, float))
        ATTRIB(XonoticGametypeButton, fontSize, float, SKINFONTSIZE_NORMAL)
@@ -26,7 +26,7 @@ void GameTypeButton_Click(entity me, entity other);
 entity makeXonoticGametypeButton(float theGroup, string theCvar, string theText)
 {
        entity me;
-       me = spawnXonoticGametypeButton();
+       me = NEW(XonoticGametypeButton);
        me.configureXonoticGametypeButton(me, theGroup, theCvar, theText);
        return me;
 }
index 0d36c836340f7b463d2c0af41c9197990ec67619..faaa177ca47d0f188e2389d596493993821e1de2 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticGametypeList) EXTENDS(XonoticListBox)
+CLASS(XonoticGametypeListXonoticListBox)
        METHOD(XonoticGametypeList, configureXonoticGametypeList, void(entity))
        ATTRIB(XonoticGametypeList, rowsPerItem, float, 2)
        METHOD(XonoticGametypeList, drawListBoxItem, void(entity, float, vector, float))
@@ -25,7 +25,7 @@ entity makeXonoticGametypeList();
 entity makeXonoticGametypeList(void)
 {
        entity me;
-       me = spawnXonoticGametypeList();
+       me = NEW(XonoticGametypeList);
        me.configureXonoticGametypeList(me);
        return me;
 }
index 9f0de67b8a1deb592ddf0aff2eb8c6f5b03097d0..2e51d899726b94a49232c3590b1f97d0756b38b3 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticImage) EXTENDS(Image)
+CLASS(XonoticImageImage)
        METHOD(XonoticImage, configureXonoticImage, void(entity, string, float))
 ENDCLASS(XonoticImage)
 entity makeXonoticImage(string theImage, float theAspect);
@@ -9,7 +9,7 @@ entity makeXonoticImage(string theImage, float theAspect);
 entity makeXonoticImage(string theImage, float theAspect)
 {
        entity me;
-       me = spawnXonoticImage();
+       me = NEW(XonoticImage);
        me.configureXonoticImage(me, theImage, theAspect);
        return me;
 }
index fef5311c75c0841a0d6025682bf7a8da6180846e..b15e475a19fc95aaea83679decae6d24f0eb4b9b 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticInputBox) EXTENDS(InputBox)
+CLASS(XonoticInputBoxInputBox)
        METHOD(XonoticInputBox, configureXonoticInputBox, void(entity, float, string))
        METHOD(XonoticInputBox, focusLeave, void(entity))
        METHOD(XonoticInputBox, setText, void(entity, string))
@@ -38,7 +38,7 @@ entity makeXonoticInputBox(float, string);
 entity makeXonoticInputBox(float doEditColorCodes, string theCvar)
 {
        entity me;
-       me = spawnXonoticInputBox();
+       me = NEW(XonoticInputBox);
        me.configureXonoticInputBox(me, doEditColorCodes, theCvar);
        return me;
 }
index 5c2b898f21acdd93e4d9eaa5d8d33753fd6dc001..e0696961074118aa31ad1fab7963b2099cc3f268 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticKeyBinder) EXTENDS(XonoticListBox)
+CLASS(XonoticKeyBinderXonoticListBox)
        METHOD(XonoticKeyBinder, configureXonoticKeyBinder, void(entity))
        ATTRIB(XonoticKeyBinder, rowsPerItem, int, 1)
        METHOD(XonoticKeyBinder, drawListBoxItem, void(entity, float, vector, float))
@@ -65,7 +65,7 @@ void Xonotic_KeyBinds_Read()
 entity makeXonoticKeyBinder()
 {
        entity me;
-       me = spawnXonoticKeyBinder();
+       me = NEW(XonoticKeyBinder);
        me.configureXonoticKeyBinder(me);
        return me;
 }
index 8aa0d2c077dd4efde44e0b94d249ba0512fc58ea..85461e63ee7847386f8043c17de5aee098b1a196 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticLanguageList) EXTENDS(XonoticListBox)
+CLASS(XonoticLanguageListXonoticListBox)
        METHOD(XonoticLanguageList, configureXonoticLanguageList, void(entity))
        ATTRIB(XonoticLanguageList, rowsPerItem, float, 1)
        METHOD(XonoticLanguageList, drawListBoxItem, void(entity, float, vector, float))
@@ -43,7 +43,7 @@ const float LANGPARM_COUNT = 4;
 entity makeXonoticLanguageList()
 {
        entity me;
-       me = spawnXonoticLanguageList();
+       me = NEW(XonoticLanguageList);
        me.configureXonoticLanguageList(me);
        return me;
 }
index 0ab574fa2f1b3869422e5b137d6a49459695580b..d3897f5724e7da369208c95df2ff5f5f8fc4ece1 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticListBox) EXTENDS(ListBox)
+CLASS(XonoticListBoxListBox)
        METHOD(XonoticListBox, configureXonoticListBox, void(entity))
        ATTRIB(XonoticListBox, fontSize, float, SKINFONTSIZE_NORMAL)
        ATTRIB(XonoticListBox, scrollbarWidth, float, SKINWIDTH_SCROLLBAR)
@@ -21,7 +21,7 @@ entity makeXonoticListBox();
 entity makeXonoticListBox()
 {
        entity me;
-       me = spawnXonoticListBox();
+       me = NEW(XonoticListBox);
        me.configureXonoticListBox(me);
        return me;
 }
index 45a0f93dcc571fee3b676a596c8348f37bfadd76..ea126beb522b9ddce5045030fce9224656fabf46 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(MainWindow) EXTENDS(ModalController)
+CLASS(MainWindowModalController)
        METHOD(MainWindow, configureMainWindow, void(entity))
        METHOD(MainWindow, draw, void(entity))
        ATTRIB(MainWindow, firstRunDialog, entity, NULL)
@@ -48,162 +48,162 @@ void MainWindow_configureMainWindow(entity me)
        entity n, i;
 
        // dialog run upon startup
-       me.firstRunDialog = i = spawnXonoticFirstRunDialog();
+       me.firstRunDialog = i = NEW(XonoticFirstRunDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
 
        // hud_configure dialogs
-       i = spawnXonoticHUDExitDialog();
+       i = NEW(XonoticHUDExitDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDNotificationDialog();
+       i = NEW(XonoticHUDNotificationDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDAmmoDialog();
+       i = NEW(XonoticHUDAmmoDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDHealthArmorDialog();
+       i = NEW(XonoticHUDHealthArmorDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDChatDialog();
+       i = NEW(XonoticHUDChatDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDModIconsDialog();
+       i = NEW(XonoticHUDModIconsDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDPowerupsDialog();
+       i = NEW(XonoticHUDPowerupsDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDPressedKeysDialog();
+       i = NEW(XonoticHUDPressedKeysDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDRaceTimerDialog();
+       i = NEW(XonoticHUDRaceTimerDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDRadarDialog();
+       i = NEW(XonoticHUDRadarDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDScoreDialog();
+       i = NEW(XonoticHUDScoreDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDTimerDialog();
+       i = NEW(XonoticHUDTimerDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDVoteDialog();
+       i = NEW(XonoticHUDVoteDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDWeaponsDialog();
+       i = NEW(XonoticHUDWeaponsDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDEngineInfoDialog();
+       i = NEW(XonoticHUDEngineInfoDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDInfoMessagesDialog();
+       i = NEW(XonoticHUDInfoMessagesDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDPhysicsDialog();
+       i = NEW(XonoticHUDPhysicsDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       me.screenshotViewerDialog = i = spawnXonoticScreenshotViewerDialog();
+       me.screenshotViewerDialog = i = NEW(XonoticScreenshotViewerDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDCenterprintDialog();
+       i = NEW(XonoticHUDCenterprintDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticHUDBuffsDialog();
+       i = NEW(XonoticHUDBuffsDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
 
        // dialogs used by settings
-       me.userbindEditDialog = i = spawnXonoticUserbindEditDialog();
+       me.userbindEditDialog = i = NEW(XonoticUserbindEditDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       me.cvarsDialog = i = spawnXonoticCvarsDialog();
+       me.cvarsDialog = i = NEW(XonoticCvarsDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       me.resetDialog = i = spawnXonoticResetDialog();
+       me.resetDialog = i = NEW(XonoticResetDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       me.languageWarningDialog = i = spawnXonoticLanguageWarningDialog();
+       me.languageWarningDialog = i = NEW(XonoticLanguageWarningDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       me.hudconfirmDialog = i = spawnXonoticHUDConfirmDialog();
+       me.hudconfirmDialog = i = NEW(XonoticHUDConfirmDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
 
        // dialog used by singleplayer
-       me.winnerDialog = i = spawnXonoticWinnerDialog();
+       me.winnerDialog = i = NEW(XonoticWinnerDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
 
        // dialog used by multiplayer/join
-       me.serverInfoDialog = i = spawnXonoticServerInfoDialog();
+       me.serverInfoDialog = i = NEW(XonoticServerInfoDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       me.demostartconfirmDialog = i = spawnXonoticDemoStartConfirmDialog();
+       me.demostartconfirmDialog = i = NEW(XonoticDemoStartConfirmDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       me.demotimeconfirmDialog = i = spawnXonoticDemoTimeConfirmDialog();
+       me.demotimeconfirmDialog = i = NEW(XonoticDemoTimeConfirmDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
 
        // dialogs used by multiplayer/create
-       me.mapInfoDialog = i = spawnXonoticMapInfoDialog();
+       me.mapInfoDialog = i = NEW(XonoticMapInfoDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       me.mutatorsDialog = i = spawnXonoticMutatorsDialog();
+       me.mutatorsDialog = i = NEW(XonoticMutatorsDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
        // mutator dialogs
-       i = spawnXonoticSandboxToolsDialog();
+       i = NEW(XonoticSandboxToolsDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z * SKINALPHA_DIALOG_SANDBOXTOOLS);
 
 
        // miscellaneous dialogs
-       i = spawnXonoticTeamSelectDialog();
+       i = NEW(XonoticTeamSelectDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       i = spawnXonoticMonsterToolsDialog();
+       i = NEW(XonoticMonsterToolsDialog);
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z * SKINALPHA_DIALOG_SANDBOXTOOLS);
 
 
        // main dialogs/windows
-       me.mainNexposee = n = spawnXonoticNexposee();
+       me.mainNexposee = n = NEW(XonoticNexposee);
        /*
                if(checkextension("DP_GECKO_SUPPORT"))
                {
@@ -213,28 +213,28 @@ void MainWindow_configureMainWindow(entity me)
                        n.setNexposee(n, i, '0.1 0.1 0', SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
                }
        */
-               i = spawnXonoticSingleplayerDialog();
+               i = NEW(XonoticSingleplayerDialog);
                i.configureDialog(i);
                n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
                n.setNexposee(n, i, SKINPOSITION_DIALOG_SINGLEPLAYER, SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
 
-               i = spawnXonoticMultiplayerDialog();
+               i = NEW(XonoticMultiplayerDialog);
                i.configureDialog(i);
                n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
                n.setNexposee(n, i, SKINPOSITION_DIALOG_MULTIPLAYER, SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
 
-               i = spawnXonoticSettingsDialog();
+               i = NEW(XonoticSettingsDialog);
                i.configureDialog(i);
                n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
                n.setNexposee(n, i, SKINPOSITION_DIALOG_SETTINGS, SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
 
-               i = spawnXonoticCreditsDialog();
+               i = NEW(XonoticCreditsDialog);
                i.configureDialog(i);
                n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
                n.setNexposee(n, i, SKINPOSITION_DIALOG_CREDITS, SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
                n.pullNexposee(n, i, eY * (SKINHEIGHT_TITLE * SKINFONTSIZE_TITLE / conheight));
 
-               i = spawnXonoticQuitDialog();
+               i = NEW(XonoticQuitDialog);
                i.configureDialog(i);
                n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
                n.setNexposee(n, i, SKINPOSITION_DIALOG_QUIT, SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
index d88ad0e8e6747beddf8296226b33a7d03fad2289..9bcc1afc41c01fd63e638a05e34fbedd3f25307e 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticMapList) EXTENDS(XonoticListBox)
+CLASS(XonoticMapListXonoticListBox)
        METHOD(XonoticMapList, configureXonoticMapList, void(entity))
        ATTRIB(XonoticMapList, rowsPerItem, float, 4)
        METHOD(XonoticMapList, draw, void(entity))
@@ -40,7 +40,7 @@ CLASS(XonoticMapList) EXTENDS(XonoticListBox)
 
        METHOD(XonoticMapList, destroy, void(entity))
 
-       ATTRIB(XonoticListBox, alphaBG, float, 0)
+       ATTRIB(XonoticMapList, alphaBG, float, 0)
 ENDCLASS(XonoticMapList)
 entity makeXonoticMapList();
 void MapList_All(entity btn, entity me);
@@ -57,7 +57,7 @@ void XonoticMapList_destroy(entity me)
 entity makeXonoticMapList()
 {
        entity me;
-       me = spawnXonoticMapList();
+       me = NEW(XonoticMapList);
        me.configureXonoticMapList(me);
        return me;
 }
index b375393c02a30047a31ed6442a0c7d16d6bc4a5a..2bbd8db0a58c40dcfd0bcc41b6a14e5c065da78f 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticNexposee) EXTENDS(Nexposee)
+CLASS(XonoticNexposeeNexposee)
        METHOD(XonoticNexposee, configureXonoticNexposee, void(entity))
        METHOD(XonoticNexposee, close, void(entity))
 ENDCLASS(XonoticNexposee)
@@ -10,7 +10,7 @@ entity makeXonoticNexposee();
 entity makeXonoticNexposee()
 {
        entity me;
-       me = spawnXonoticNexposee();
+       me = NEW(XonoticNexposee);
        me.configureXonoticNexposee(me);
        return me;
 }
index d4dc5af05df05e60fa6eaec11eaa50ff45e85365..3c0481471185f1b3a9e3a8fab15da6e48ad5e929 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticPlayerList) EXTENDS(XonoticListBox)
+CLASS(XonoticPlayerListXonoticListBox)
        ATTRIB(XonoticPlayerList, rowsPerItem, float, 1)
        METHOD(XonoticPlayerList, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(XonoticPlayerList, drawListBoxItem, void(entity, float, vector, float))
@@ -30,7 +30,7 @@ const float PLAYERPARM_COUNT = 4;
 entity makeXonoticPlayerList()
 {
        entity me;
-       me = spawnXonoticPlayerList();
+       me = NEW(XonoticPlayerList);
        me.configureXonoticListBox(me);
        return me;
 }
index f498f8d2133cf01628bb8b4518bacc51e2588641..73d6dd28c35fe4bf768059ea2ca7160ff03001cf 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticPlayerModelSelector) EXTENDS(XonoticImage)
+CLASS(XonoticPlayerModelSelectorXonoticImage)
        METHOD(XonoticPlayerModelSelector, configureXonoticPlayerModelSelector, void(entity))
        METHOD(XonoticPlayerModelSelector, loadCvars, void(entity))
        METHOD(XonoticPlayerModelSelector, saveCvars, void(entity))
@@ -31,7 +31,7 @@ void PlayerModelSelector_Prev_Click(entity btn, entity me);
 entity makeXonoticPlayerModelSelector()
 {
        entity me;
-       me = spawnXonoticPlayerModelSelector();
+       me = NEW(XonoticPlayerModelSelector);
        me.configureXonoticPlayerModelSelector(me);
        return me;
 }
index fbe3c92c6793f03d25d3bede3118f9ccfd533857..5d71755d0f5528425312eb6f70691649237b3e9b 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticPlayList) EXTENDS(XonoticListBox)
+CLASS(XonoticPlayListXonoticListBox)
        METHOD(XonoticPlayList, configureXonoticPlayList, void(entity))
        ATTRIB(XonoticPlayList, rowsPerItem, float, 1)
        METHOD(XonoticPlayList, resizeNotify, void(entity, vector, vector, vector, vector))
@@ -42,7 +42,7 @@ void NextSound_Click(entity btn, entity me);
 entity makeXonoticPlayList()
 {
        entity me;
-       me = spawnXonoticPlayList();
+       me = NEW(XonoticPlayList);
        me.configureXonoticPlayList(me);
        return me;
 }
index 85cc4fc5c559a3c56125fcce05e8aef6f1f7bf6e..000da90e3485c1fa6d5dd9ee91de532a7c5e81b7 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticRadioButton) EXTENDS(RadioButton)
+CLASS(XonoticRadioButtonRadioButton)
        METHOD(XonoticRadioButton, configureXonoticRadioButton, void(entity, float, string, string, string))
        METHOD(XonoticRadioButton, draw, void(entity))
        METHOD(XonoticRadioButton, setChecked, void(entity, float))
@@ -27,7 +27,7 @@ entity makeXonoticRadioButton(float, string, string, string);
 entity makeXonoticRadioButton(float theGroup, string theCvar, string theValue, string theText)
 {
        entity me;
-       me = spawnXonoticRadioButton();
+       me = NEW(XonoticRadioButton);
        me.configureXonoticRadioButton(me, theGroup, theCvar, theValue, theText);
        return me;
 }
index e8c9db364e9d3caaa31f4ee904b82ebc08c33523..954cb73046fe9d7fbc0fbd5a4086929bf5efc030 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticRootDialog) EXTENDS(XonoticDialog)
+CLASS(XonoticRootDialogXonoticDialog)
        // still to be customized by user
        /*
        ATTRIB(XonoticDialog, closable, float, 1)
index a800a849486aceae4d7651f2adbaf41a4c36db40..756c1a449cb4454297109524e412d435a6a6d37b 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticScreenshotImage) EXTENDS(XonoticImage)
+CLASS(XonoticScreenshotImageXonoticImage)
        METHOD(XonoticScreenshotImage, configureXonoticScreenshotImage, void(entity))
        METHOD(XonoticScreenshotImage, load, void(entity, string))
        METHOD(XonoticScreenshotImage, draw, void(entity))
@@ -21,7 +21,7 @@ entity makeXonoticScreenshotImage();
 entity makeXonoticScreenshotImage()
 {
        entity me;
-       me = spawnXonoticScreenshotImage();
+       me = NEW(XonoticScreenshotImage);
        me.configureXonoticScreenshotImage(me);
        return me;
 }
index 225eefb249d1660579047ed82d775660dbefee41..8730fa8dd2a0b224bf1a461967836335b0f66e00 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticScreenshotList) EXTENDS(XonoticListBox)
+CLASS(XonoticScreenshotListXonoticListBox)
        METHOD(XonoticScreenshotList, configureXonoticScreenshotList, void(entity))
        ATTRIB(XonoticScreenshotList, rowsPerItem, float, 1)
        METHOD(XonoticScreenshotList, resizeNotify, void(entity, vector, vector, vector, vector))
@@ -49,7 +49,7 @@ void ScreenshotList_Filter_Change(entity box, entity me);
 entity makeXonoticScreenshotList()
 {
        entity me;
-       me = spawnXonoticScreenshotList();
+       me = NEW(XonoticScreenshotList);
        me.configureXonoticScreenshotList(me);
        return me;
 }
index 29877c5d5e888a8c16a9469ab480580176e018a2..7837693b4975c8d9d878023df8199f1c249de3e1 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticServerList) EXTENDS(XonoticListBox)
+CLASS(XonoticServerListXonoticListBox)
        METHOD(XonoticServerList, configureXonoticServerList, void(entity))
        ATTRIB(XonoticServerList, rowsPerItem, float, 1)
        METHOD(XonoticServerList, draw, void(entity))
@@ -440,7 +440,7 @@ void ServerList_Update_favoriteButton(entity btn, entity me)
 entity makeXonoticServerList()
 {
        entity me;
-       me = spawnXonoticServerList();
+       me = NEW(XonoticServerList);
        me.configureXonoticServerList(me);
        return me;
 }
index 9990c83fe162ee2c2ab4f37ea7e1c43a1fcf24ce..f667a88477e8bb77dd77acfbd17e4eab20f0a6f2 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticSkinList) EXTENDS(XonoticListBox)
+CLASS(XonoticSkinListXonoticListBox)
        METHOD(XonoticSkinList, configureXonoticSkinList, void(entity))
        ATTRIB(XonoticSkinList, rowsPerItem, float, 4)
        METHOD(XonoticSkinList, resizeNotify, void(entity, vector, vector, vector, vector))
@@ -42,7 +42,7 @@ const float SKINPARM_COUNT = 4;
 entity makeXonoticSkinList()
 {
        entity me;
-       me = spawnXonoticSkinList();
+       me = NEW(XonoticSkinList);
        me.configureXonoticSkinList(me);
        return me;
 }
index d63fe1c336c8ae2d2577803b67bd12cbfe59b5cb..8130534eb41d54f5325c7bfbd4c98050c1c53b86 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticSlider) EXTENDS(Slider)
+CLASS(XonoticSliderSlider)
        METHOD(XonoticSlider, configureXonoticSlider, void(entity, float, float, float, string))
        METHOD(XonoticSlider, setValue, void(entity, float))
        ATTRIB(XonoticSlider, fontSize, float, SKINFONTSIZE_NORMAL)
@@ -28,7 +28,7 @@ entity makeXonoticSlider(float, float, float, string);
 entity makeXonoticSlider(float theValueMin, float theValueMax, float theValueStep, string theCvar)
 {
        entity me;
-       me = spawnXonoticSlider();
+       me = NEW(XonoticSlider);
        me.configureXonoticSlider(me, theValueMin, theValueMax, theValueStep, theCvar);
        return me;
 }
index 07632320ed29d89da88f90d7e914c00576833b35..e3e77c31975648c42e4d5cd6c1ab6ea05b98ac32 100644 (file)
@@ -1,7 +1,7 @@
 #include "../../warpzonelib/mathlib.qh"
 
 #ifdef INTERFACE
-CLASS(XonoticDecibelsSlider) EXTENDS(XonoticSlider)
+CLASS(XonoticDecibelsSliderXonoticSlider)
        METHOD(XonoticDecibelsSlider, loadCvars, void(entity))
        METHOD(XonoticDecibelsSlider, saveCvars, void(entity))
        METHOD(XonoticDecibelsSlider, valueToText, string(entity, float))
@@ -42,7 +42,7 @@ float fromDecibelOfSquare(float f, float mi)
 entity makeXonoticDecibelsSlider(float theValueMin, float theValueMax, float theValueStep, string theCvar)
 {
        entity me;
-       me = spawnXonoticDecibelsSlider();
+       me = NEW(XonoticDecibelsSlider);
        me.configureXonoticSlider(me, theValueMin, theValueMax, theValueStep, theCvar);
        return me;
 }
index 818dcb84b842c2ad2dd7c9b9456ecbbcd22e5e0b..0bfe05c5d3a4a3da8c0e13a146481ba2387bfe59 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticParticlesSlider) EXTENDS(XonoticTextSlider)
+CLASS(XonoticParticlesSliderXonoticTextSlider)
        METHOD(XonoticParticlesSlider, configureXonoticParticlesSlider, void(entity))
        METHOD(XonoticParticlesSlider, loadCvars, void(entity))
        METHOD(XonoticParticlesSlider, saveCvars, void(entity))
@@ -11,7 +11,7 @@ entity makeXonoticParticlesSlider();
 entity makeXonoticParticlesSlider()
 {
        entity me;
-       me = spawnXonoticParticlesSlider();
+       me = NEW(XonoticParticlesSlider);
        me.configureXonoticParticlesSlider(me);
        return me;
 }
index ddedc4bab2901e2cd077a60c475aef525f223e80..201da72d5eeb72e8c48ceed89a690d1f6f31ef14 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticPicmipSlider) EXTENDS(XonoticTextSlider)
+CLASS(XonoticPicmipSliderXonoticTextSlider)
        METHOD(XonoticPicmipSlider, configureXonoticPicmipSlider, void(entity))
        METHOD(XonoticPicmipSlider, draw, void(entity))
        METHOD(XonoticPicmipSlider, autofix, void(entity))
@@ -12,7 +12,7 @@ entity makeXonoticPicmipSlider(); // note: you still need to call addValue and c
 entity makeXonoticPicmipSlider()
 {
        entity me;
-       me = spawnXonoticPicmipSlider();
+       me = NEW(XonoticPicmipSlider);
        me.configureXonoticPicmipSlider(me);
        return me;
 }
index c1443628106e7b4b2947d8a86c669d6c2a2a5e88..b15e13096ac109141f8d6aa526e1adaf3431efb4 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticResolutionSlider) EXTENDS(XonoticTextSlider)
+CLASS(XonoticResolutionSliderXonoticTextSlider)
        METHOD(XonoticResolutionSlider, configureXonoticResolutionSlider, void(entity))
        METHOD(XonoticResolutionSlider, loadResolutions, void(entity, float))
        METHOD(XonoticResolutionSlider, addResolution, void(entity, float, float, float))
@@ -83,7 +83,7 @@ float updateConwidths(float width, float height, float pixelheight)
 entity makeXonoticResolutionSlider()
 {
        entity me;
-       me = spawnXonoticResolutionSlider();
+       me = NEW(XonoticResolutionSlider);
        me.configureXonoticResolutionSlider(me);
        return me;
 }
index 39f91f933cf734ccdbee07587f8f9757e94c1f19..03d3e34026b9d513e724585a0db1fdc8098a4566 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticScoreboardFadeTimeSlider) EXTENDS(XonoticTextSlider)
+CLASS(XonoticScoreboardFadeTimeSliderXonoticTextSlider)
        METHOD(XonoticScoreboardFadeTimeSlider, configureXonoticScoreboardFadeTimeSlider, void(entity))
        METHOD(XonoticScoreboardFadeTimeSlider, loadCvars, void(entity))
        METHOD(XonoticScoreboardFadeTimeSlider, saveCvars, void(entity))
@@ -11,7 +11,7 @@ entity makeXonoticScoreboardFadeTimeSlider();
 entity makeXonoticScoreboardFadeTimeSlider()
 {
        entity me;
-       me = spawnXonoticScoreboardFadeTimeSlider();
+       me = NEW(XonoticScoreboardFadeTimeSlider);
        me.configureXonoticScoreboardFadeTimeSlider(me);
        return me;
 }
index e443a53efb42ddcab91cd3d1df8804df0d8b0777..ae859779ed1ac62722dfb863adcdc22aa5f5c90a 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticSoundList) EXTENDS(XonoticListBox)
+CLASS(XonoticSoundListXonoticListBox)
        METHOD(XonoticSoundList, configureXonoticSoundList, void(entity))
        ATTRIB(XonoticSoundList, rowsPerItem, float, 1)
        METHOD(XonoticSoundList, resizeNotify, void(entity, vector, vector, vector, vector))
@@ -38,7 +38,7 @@ void SoundList_Menu_Track_Reset(entity box, entity me);
 entity makeXonoticSoundList()
 {
        entity me;
-       me = spawnXonoticSoundList();
+       me = NEW(XonoticSoundList);
        me.configureXonoticSoundList(me);
        return me;
 }
index 99c850f13558e456d599b2ba333816748431dcba..ab22ff0c753f321f0b13fc21d539cedbe9c47f67 100644 (file)
@@ -2,7 +2,7 @@
 #include "../../common/playerstats.qh"
 
 #ifdef INTERFACE
-CLASS(XonoticStatsList) EXTENDS(XonoticListBox)
+CLASS(XonoticStatsListXonoticListBox)
        METHOD(XonoticStatsList, configureXonoticStatsList, void(entity))
        ATTRIB(XonoticStatsList, rowsPerItem, float, 1.4)
        METHOD(XonoticStatsList, resizeNotify, void(entity, vector, vector, vector, vector))
@@ -32,7 +32,7 @@ entity makeXonoticStatsList();
 entity makeXonoticStatsList()
 {
        entity me;
-       me = spawnXonoticStatsList();
+       me = NEW(XonoticStatsList);
        me.configureXonoticStatsList(me);
        return me;
 }
index d1a867a2f88817253b5285838a772c444caf9994..fd4b50cc3267a628575e31ef458378592c820398 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticTab) EXTENDS(Tab)
+CLASS(XonoticTabTab)
        // still to be customized by user
        /*
        ATTRIB(XonoticTab, intendedWidth, float, 0)
index 1faa625aee83c607a4af8eab55117a0ddde091ea..d3aba3331ba1678daf31dff693162e506e01ed6b 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticTabController) EXTENDS(ModalController)
+CLASS(XonoticTabControllerModalController)
        METHOD(XonoticTabController, configureXonoticTabController, void(entity, float))
        METHOD(XonoticTabController, makeTabButton, entity(entity, string, entity))
        ATTRIB(XonoticTabController, rows, float, 0)
@@ -13,7 +13,7 @@ entity makeXonoticTabController(float theRows);
 entity makeXonoticTabController(float theRows)
 {
        entity me;
-       me = spawnXonoticTabController();
+       me = NEW(XonoticTabController);
        me.configureXonoticTabController(me, theRows);
        return me;
 }
index cb54da19e21b81f901cea7d1e5c697ecfdbfe5d1..7bab8c4060a7a03bfed521b65bbb82e711b685a9 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticTextLabel) EXTENDS(Label)
+CLASS(XonoticTextLabelLabel)
        METHOD(XonoticTextLabel, configureXonoticTextLabel, void(entity, float, string))
        METHOD(XonoticTextLabel, draw, void(entity))
        ATTRIB(XonoticTextLabel, fontSize, float, SKINFONTSIZE_NORMAL)
@@ -13,7 +13,7 @@ entity makeXonoticTextLabel(float theAlign, string theText);
 entity makeXonoticTextLabel(float theAlign, string theText)
 {
        entity me;
-       me = spawnXonoticTextLabel();
+       me = NEW(XonoticTextLabel);
        me.configureXonoticTextLabel(me, theAlign, theText);
        return me;
 }
index dabd1b1a6bacba2fd479e2d2b6fba021661147b1..131f35be1ca1e88c3b59e0ef7114855404bbc43b 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticTextSlider) EXTENDS(TextSlider)
+CLASS(XonoticTextSliderTextSlider)
        METHOD(XonoticTextSlider, configureXonoticTextSlider, void(entity, string))
        METHOD(XonoticTextSlider, setValue, void(entity, float))
        METHOD(XonoticTextSlider, configureXonoticTextSliderValues, void(entity))
@@ -29,7 +29,7 @@ entity makeXonoticTextSlider(string); // note: you still need to call addValue a
 entity makeXonoticTextSlider(string theCvar)
 {
        entity me;
-       me = spawnXonoticTextSlider();
+       me = NEW(XonoticTextSlider);
        me.configureXonoticTextSlider(me, theCvar);
        return me;
 }
index a7d71f0d2cf5db902dd9106f9e7985477ecd7453..21aa1f4e2ef0f55db21fe577f5afd416601f1be6 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticWeaponarenaCheckBox) EXTENDS(CheckBox)
+CLASS(XonoticWeaponarenaCheckBoxCheckBox)
        METHOD(XonoticWeaponarenaCheckBox, configureXonoticWeaponarenaCheckBox, void(entity, string, string))
        METHOD(XonoticWeaponarenaCheckBox, setChecked, void(entity, float))
        ATTRIB(XonoticWeaponarenaCheckBox, fontSize, float, SKINFONTSIZE_NORMAL)
@@ -16,7 +16,7 @@ entity makeXonoticWeaponarenaCheckBox(string, string);
 entity makeXonoticWeaponarenaCheckBox(string theWeapon, string theText)
 {
        entity me;
-       me = spawnXonoticWeaponarenaCheckBox();
+       me = NEW(XonoticWeaponarenaCheckBox);
        me.configureXonoticWeaponarenaCheckBox(me, theWeapon, theText);
        return me;
 }
index 46d4e273f089004d503c074149e39d7da1f9e222..a82f2525e6be4b318127d09be7ec378059dea8df 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticWeaponsList) EXTENDS(XonoticListBox)
+CLASS(XonoticWeaponsListXonoticListBox)
        METHOD(XonoticWeaponsList, configureXonoticWeaponsList, void(entity))
        METHOD(XonoticWeaponsList, toString, string(entity))
        ATTRIB(XonoticWeaponsList, rowsPerItem, float, 1)
@@ -20,7 +20,7 @@ void WeaponsList_MoveDown_Click(entity box, entity me);
 entity makeXonoticWeaponsList()
 {
        entity me;
-       me = spawnXonoticWeaponsList();
+       me = NEW(XonoticWeaponsList);
        me.configureXonoticWeaponsList(me);
        return me;
 }