From: TimePath Date: Sun, 3 May 2015 11:39:11 +0000 (+1000) Subject: Merge CLASS and EXTENDS, #define NEW(cname) (spawn##cname()) X-Git-Tag: xonotic-v0.8.1~61^2~11 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=244f8292cf03247e90bf1a0c3fee1f491f6b93a0;p=xonotic%2Fxonotic-data.pk3dir.git Merge CLASS and EXTENDS, #define NEW(cname) (spawn##cname()) --- diff --git a/qcsrc/menu/anim/animation.qc b/qcsrc/menu/anim/animation.qc index 26b01d718..411896ade 100644 --- a/qcsrc/menu/anim/animation.qc +++ b/qcsrc/menu/anim/animation.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(Animation) EXTENDS(Object) +CLASS(Animation, Object) 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)) diff --git a/qcsrc/menu/anim/animhost.qc b/qcsrc/menu/anim/animhost.qc index c46334d53..9f450236d 100644 --- a/qcsrc/menu/anim/animhost.qc +++ b/qcsrc/menu/anim/animhost.qc @@ -1,7 +1,7 @@ #include "../menu.qh" #ifdef INTERFACE -CLASS(AnimHost) EXTENDS(Object) +CLASS(AnimHost, Object) METHOD(AnimHost, addAnim, void(entity, entity)) METHOD(AnimHost, removeAnim, void(entity, entity)) METHOD(AnimHost, removeAllAnim, void(entity)) diff --git a/qcsrc/menu/anim/easing.qc b/qcsrc/menu/anim/easing.qc index 94ea9cf08..9856c2385 100644 --- a/qcsrc/menu/anim/easing.qc +++ b/qcsrc/menu/anim/easing.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(Easing) EXTENDS(Animation) +CLASS(Easing, Animation) 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; diff --git a/qcsrc/menu/anim/keyframe.qc b/qcsrc/menu/anim/keyframe.qc index 3bcda94e6..3a7ec55a7 100644 --- a/qcsrc/menu/anim/keyframe.qc +++ b/qcsrc/menu/anim/keyframe.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(Keyframe) EXTENDS(Animation) +CLASS(Keyframe, Animation) 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; } diff --git a/qcsrc/menu/item.qc b/qcsrc/menu/item.qc index d0bd40b03..73acad07e 100644 --- a/qcsrc/menu/item.qc +++ b/qcsrc/menu/item.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(Item) EXTENDS(Object) +CLASS(Item, Object) METHOD(Item, draw, void(entity)) METHOD(Item, keyDown, float(entity, float, float, float)) METHOD(Item, keyUp, float(entity, float, float, float)) diff --git a/qcsrc/menu/item/borderimage.qc b/qcsrc/menu/item/borderimage.qc index e6affc1c0..422390a69 100644 --- a/qcsrc/menu/item/borderimage.qc +++ b/qcsrc/menu/item/borderimage.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(BorderImage) EXTENDS(Label) +CLASS(BorderImage, Label) 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)) diff --git a/qcsrc/menu/item/button.qc b/qcsrc/menu/item/button.qc index 52e58238c..44a0ada9b 100644 --- a/qcsrc/menu/item/button.qc +++ b/qcsrc/menu/item/button.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(Button) EXTENDS(Label) +CLASS(Button, Label) METHOD(Button, configureButton, void(entity, string, float, string)) METHOD(Button, draw, void(entity)) METHOD(Button, showNotify, void(entity)) diff --git a/qcsrc/menu/item/checkbox.qc b/qcsrc/menu/item/checkbox.qc index 2540cc846..56cf449bd 100644 --- a/qcsrc/menu/item/checkbox.qc +++ b/qcsrc/menu/item/checkbox.qc @@ -1,6 +1,6 @@ #ifdef INTERFACE void CheckBox_Click(entity me, entity other); -CLASS(CheckBox) EXTENDS(Button) +CLASS(CheckBox, Button) METHOD(CheckBox, configureCheckBox, void(entity, string, float, string)) METHOD(CheckBox, draw, void(entity)) METHOD(CheckBox, playClickSound, void(entity)) diff --git a/qcsrc/menu/item/container.qc b/qcsrc/menu/item/container.qc index b4dda3e33..b4c6fdc45 100644 --- a/qcsrc/menu/item/container.qc +++ b/qcsrc/menu/item/container.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(Container) EXTENDS(Item) +CLASS(Container, Item) METHOD(Container, draw, void(entity)) METHOD(Container, keyUp, float(entity, float, float, float)) METHOD(Container, keyDown, float(entity, float, float, float)) diff --git a/qcsrc/menu/item/dialog.qc b/qcsrc/menu/item/dialog.qc index 1723f27cb..e68a0931d 100644 --- a/qcsrc/menu/item/dialog.qc +++ b/qcsrc/menu/item/dialog.qc @@ -14,7 +14,7 @@ // a subclass may help with using this as a tab #ifdef INTERFACE -CLASS(Dialog) EXTENDS(InputContainer) +CLASS(Dialog, InputContainer) METHOD(Dialog, configureDialog, void(entity)) // no runtime configuration, all parameters are given in the code! METHOD(Dialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls 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; diff --git a/qcsrc/menu/item/image.qc b/qcsrc/menu/item/image.qc index b67df840c..b78b6f589 100644 --- a/qcsrc/menu/item/image.qc +++ b/qcsrc/menu/item/image.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(Image) EXTENDS(Item) +CLASS(Image, Item) METHOD(Image, configureImage, void(entity, string)) METHOD(Image, draw, void(entity)) METHOD(Image, toString, string(entity)) diff --git a/qcsrc/menu/item/inputbox.qc b/qcsrc/menu/item/inputbox.qc index 275b20046..bb02fda71 100644 --- a/qcsrc/menu/item/inputbox.qc +++ b/qcsrc/menu/item/inputbox.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(InputBox) EXTENDS(Label) +CLASS(InputBox, Label) METHOD(InputBox, configureInputBox, void(entity, string, float, float, string)) METHOD(InputBox, draw, void(entity)) METHOD(InputBox, setText, void(entity, string)) diff --git a/qcsrc/menu/item/inputcontainer.qc b/qcsrc/menu/item/inputcontainer.qc index 8c09d1991..7da569357 100644 --- a/qcsrc/menu/item/inputcontainer.qc +++ b/qcsrc/menu/item/inputcontainer.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(InputContainer) EXTENDS(Container) +CLASS(InputContainer, Container) METHOD(InputContainer, keyDown, float(entity, float, float, float)) METHOD(InputContainer, mouseMove, float(entity, vector)) METHOD(InputContainer, mousePress, float(entity, vector)) diff --git a/qcsrc/menu/item/label.qc b/qcsrc/menu/item/label.qc index a1769fc03..2e91ee15b 100644 --- a/qcsrc/menu/item/label.qc +++ b/qcsrc/menu/item/label.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(Label) EXTENDS(Item) +CLASS(Label, Item) METHOD(Label, configureLabel, void(entity, string, float, float)) METHOD(Label, draw, void(entity)) METHOD(Label, resizeNotify, void(entity, vector, vector, vector, vector)) diff --git a/qcsrc/menu/item/listbox.qc b/qcsrc/menu/item/listbox.qc index 478a2063f..4623a5ffa 100644 --- a/qcsrc/menu/item/listbox.qc +++ b/qcsrc/menu/item/listbox.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(ListBox) EXTENDS(Item) +CLASS(ListBox, Item) METHOD(ListBox, resizeNotify, void(entity, vector, vector, vector, vector)) METHOD(ListBox, configureListBox, void(entity, float, float)) METHOD(ListBox, draw, void(entity)) diff --git a/qcsrc/menu/item/modalcontroller.qc b/qcsrc/menu/item/modalcontroller.qc index 3ef656744..228f7a513 100644 --- a/qcsrc/menu/item/modalcontroller.qc +++ b/qcsrc/menu/item/modalcontroller.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(ModalController) EXTENDS(Container) +CLASS(ModalController, Container) METHOD(ModalController, resizeNotify, void(entity, vector, vector, vector, vector)) METHOD(ModalController, draw, void(entity)) METHOD(ModalController, showChild, void(entity, entity, vector, vector, float)) diff --git a/qcsrc/menu/item/nexposee.qc b/qcsrc/menu/item/nexposee.qc index 141303985..b0d30cb1b 100644 --- a/qcsrc/menu/item/nexposee.qc +++ b/qcsrc/menu/item/nexposee.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(Nexposee) EXTENDS(Container) +CLASS(Nexposee, Container) METHOD(Nexposee, draw, void(entity)) METHOD(Nexposee, keyDown, float(entity, float, float, float)) METHOD(Nexposee, keyUp, float(entity, float, float, float)) diff --git a/qcsrc/menu/item/radiobutton.qc b/qcsrc/menu/item/radiobutton.qc index 80fd5329b..97168fc53 100644 --- a/qcsrc/menu/item/radiobutton.qc +++ b/qcsrc/menu/item/radiobutton.qc @@ -1,6 +1,6 @@ #ifdef INTERFACE void RadioButton_Click(entity me, entity other); -CLASS(RadioButton) EXTENDS(CheckBox) +CLASS(RadioButton, CheckBox) METHOD(RadioButton, configureRadioButton, void(entity, string, float, string, float, float)) ATTRIB(RadioButton, checked, float, 0) ATTRIB(RadioButton, group, float, 0) diff --git a/qcsrc/menu/item/slider.qc b/qcsrc/menu/item/slider.qc index 2c74f6131..b7605e489 100644 --- a/qcsrc/menu/item/slider.qc +++ b/qcsrc/menu/item/slider.qc @@ -1,7 +1,7 @@ // Note: // to use this, you FIRST call configureSliderVisuals, then configureSliderValues #ifdef INTERFACE -CLASS(Slider) EXTENDS(Label) +CLASS(Slider, Label) 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)) diff --git a/qcsrc/menu/item/tab.qc b/qcsrc/menu/item/tab.qc index 8cd72ba9c..d5796c190 100644 --- a/qcsrc/menu/item/tab.qc +++ b/qcsrc/menu/item/tab.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(Tab) EXTENDS(Dialog) +CLASS(Tab, Dialog) ATTRIB(Tab, isTabRoot, float, 0) ATTRIB(Tab, closable, float, 0) ATTRIB(Tab, rootDialog, float, 0) diff --git a/qcsrc/menu/item/textslider.qc b/qcsrc/menu/item/textslider.qc index 93d4090e0..db8b55260 100644 --- a/qcsrc/menu/item/textslider.qc +++ b/qcsrc/menu/item/textslider.qc @@ -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(TextSlider, Slider) METHOD(TextSlider, valueToText, string(entity, float)) METHOD(TextSlider, valueToIdentifier, string(entity, float)) METHOD(TextSlider, setValueFromIdentifier, void(entity, string)) diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc index a2c2c9413..a8a3213f2 100644 --- a/qcsrc/menu/menu.qc +++ b/qcsrc/menu/menu.qc @@ -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); diff --git a/qcsrc/menu/oo/base.qh b/qcsrc/menu/oo/base.qh index 55af8adb8..30423850e 100644 --- a/qcsrc/menu/oo/base.qh +++ b/qcsrc/menu/oo/base.qh @@ -28,4 +28,7 @@ entity spawnObject() Object_vtbl = spawnVtbl(e, null_entity); return e; } + +#define NEW(cname) (spawn##cname()) + #endif diff --git a/qcsrc/menu/oo/implementation.qc b/qcsrc/menu/oo/implementation.qc index d01152360..78cba1ddb 100644 --- a/qcsrc/menu/oo/implementation.qc +++ b/qcsrc/menu/oo/implementation.qc @@ -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) diff --git a/qcsrc/menu/oo/interface.qc b/qcsrc/menu/oo/interface.qc index 50485bc54..5062045f5 100644 --- a/qcsrc/menu/oo/interface.qc +++ b/qcsrc/menu/oo/interface.qc @@ -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]; diff --git a/qcsrc/menu/xonotic/bigbutton.qc b/qcsrc/menu/xonotic/bigbutton.qc index a63189b63..897d05d8d 100644 --- a/qcsrc/menu/xonotic/bigbutton.qc +++ b/qcsrc/menu/xonotic/bigbutton.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticBigButton) EXTENDS(XonoticButton) +CLASS(XonoticBigButton, XonoticButton) 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; } diff --git a/qcsrc/menu/xonotic/bigcommandbutton.qc b/qcsrc/menu/xonotic/bigcommandbutton.qc index c96dd57a1..d7d203160 100644 --- a/qcsrc/menu/xonotic/bigcommandbutton.qc +++ b/qcsrc/menu/xonotic/bigcommandbutton.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticBigCommandButton) EXTENDS(XonoticCommandButton) +CLASS(XonoticBigCommandButton, XonoticCommandButton) 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; } diff --git a/qcsrc/menu/xonotic/button.qc b/qcsrc/menu/xonotic/button.qc index cbc7c47c4..99018cb2d 100644 --- a/qcsrc/menu/xonotic/button.qc +++ b/qcsrc/menu/xonotic/button.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticButton) EXTENDS(Button) +CLASS(XonoticButton, Button) 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; } diff --git a/qcsrc/menu/xonotic/campaign.qc b/qcsrc/menu/xonotic/campaign.qc index 16967a688..3ce8fa29e 100644 --- a/qcsrc/menu/xonotic/campaign.qc +++ b/qcsrc/menu/xonotic/campaign.qc @@ -1,7 +1,7 @@ #include "../../common/campaign_common.qh" #ifdef INTERFACE -CLASS(XonoticCampaignList) EXTENDS(XonoticListBox) +CLASS(XonoticCampaignList, XonoticListBox) 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; } diff --git a/qcsrc/menu/xonotic/charmap.qc b/qcsrc/menu/xonotic/charmap.qc index 0ba72a5d8..06e4926db 100644 --- a/qcsrc/menu/xonotic/charmap.qc +++ b/qcsrc/menu/xonotic/charmap.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticCharmap) EXTENDS(Item) +CLASS(XonoticCharmap, Item) 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; } diff --git a/qcsrc/menu/xonotic/checkbox.qc b/qcsrc/menu/xonotic/checkbox.qc index 631a430dc..321bf7ebf 100644 --- a/qcsrc/menu/xonotic/checkbox.qc +++ b/qcsrc/menu/xonotic/checkbox.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticCheckBox) EXTENDS(CheckBox) +CLASS(XonoticCheckBox, CheckBox) 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; } diff --git a/qcsrc/menu/xonotic/checkbox_slider_invalid.qc b/qcsrc/menu/xonotic/checkbox_slider_invalid.qc index e3043184a..22cdf8b0b 100644 --- a/qcsrc/menu/xonotic/checkbox_slider_invalid.qc +++ b/qcsrc/menu/xonotic/checkbox_slider_invalid.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticSliderCheckBox) EXTENDS(CheckBox) +CLASS(XonoticSliderCheckBox, CheckBox) 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; } diff --git a/qcsrc/menu/xonotic/checkbox_string.qc b/qcsrc/menu/xonotic/checkbox_string.qc index aeda757f0..c36b710bf 100644 --- a/qcsrc/menu/xonotic/checkbox_string.qc +++ b/qcsrc/menu/xonotic/checkbox_string.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticCheckBoxString) EXTENDS(CheckBox) +CLASS(XonoticCheckBoxString, CheckBox) 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; } diff --git a/qcsrc/menu/xonotic/colorbutton.qc b/qcsrc/menu/xonotic/colorbutton.qc index bcbdfee8d..527c0512e 100644 --- a/qcsrc/menu/xonotic/colorbutton.qc +++ b/qcsrc/menu/xonotic/colorbutton.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticColorButton) EXTENDS(RadioButton) +CLASS(XonoticColorButton, RadioButton) 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; } diff --git a/qcsrc/menu/xonotic/colorpicker.qc b/qcsrc/menu/xonotic/colorpicker.qc index f16ab0ebd..86da883a9 100644 --- a/qcsrc/menu/xonotic/colorpicker.qc +++ b/qcsrc/menu/xonotic/colorpicker.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticColorpicker) EXTENDS(Image) +CLASS(XonoticColorpicker, Image) 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; } diff --git a/qcsrc/menu/xonotic/colorpicker_string.qc b/qcsrc/menu/xonotic/colorpicker_string.qc index 458a72c01..4a5db88df 100644 --- a/qcsrc/menu/xonotic/colorpicker_string.qc +++ b/qcsrc/menu/xonotic/colorpicker_string.qc @@ -1,12 +1,12 @@ #ifdef INTERFACE -CLASS(XonoticColorpickerString) EXTENDS(Image) +CLASS(XonoticColorpickerString, Image) 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; diff --git a/qcsrc/menu/xonotic/commandbutton.qc b/qcsrc/menu/xonotic/commandbutton.qc index 8ee4e7de3..e0c17d55c 100644 --- a/qcsrc/menu/xonotic/commandbutton.qc +++ b/qcsrc/menu/xonotic/commandbutton.qc @@ -5,7 +5,7 @@ #endif #ifdef INTERFACE -CLASS(XonoticCommandButton) EXTENDS(XonoticButton) +CLASS(XonoticCommandButton, XonoticButton) 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; } diff --git a/qcsrc/menu/xonotic/credits.qc b/qcsrc/menu/xonotic/credits.qc index 67848f914..c6f320bc9 100644 --- a/qcsrc/menu/xonotic/credits.qc +++ b/qcsrc/menu/xonotic/credits.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticCreditsList) EXTENDS(XonoticListBox) +CLASS(XonoticCreditsList, XonoticListBox) 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; } diff --git a/qcsrc/menu/xonotic/crosshairbutton.qc b/qcsrc/menu/xonotic/crosshairbutton.qc index 3b562cb77..4ed6352f9 100644 --- a/qcsrc/menu/xonotic/crosshairbutton.qc +++ b/qcsrc/menu/xonotic/crosshairbutton.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticCrosshairButton) EXTENDS(RadioButton) +CLASS(XonoticCrosshairButton, RadioButton) 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; } diff --git a/qcsrc/menu/xonotic/cvarlist.qc b/qcsrc/menu/xonotic/cvarlist.qc index 421142aac..a965f2cf9 100644 --- a/qcsrc/menu/xonotic/cvarlist.qc +++ b/qcsrc/menu/xonotic/cvarlist.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticCvarList) EXTENDS(XonoticListBox) +CLASS(XonoticCvarList, XonoticListBox) 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; } diff --git a/qcsrc/menu/xonotic/demolist.qc b/qcsrc/menu/xonotic/demolist.qc index 6882fcc5e..170a4bba6 100644 --- a/qcsrc/menu/xonotic/demolist.qc +++ b/qcsrc/menu/xonotic/demolist.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticDemoList) EXTENDS(XonoticListBox) +CLASS(XonoticDemoList, XonoticListBox) 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; } diff --git a/qcsrc/menu/xonotic/dialog.qc b/qcsrc/menu/xonotic/dialog.qc index 6ca90254a..3f6f30fc9 100644 --- a/qcsrc/menu/xonotic/dialog.qc +++ b/qcsrc/menu/xonotic/dialog.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticDialog) EXTENDS(Dialog) +CLASS(XonoticDialog, Dialog) // still to be customized by user /* ATTRIB(XonoticDialog, closable, float, 1) diff --git a/qcsrc/menu/xonotic/dialog_credits.qc b/qcsrc/menu/xonotic/dialog_credits.qc index e90ae4b42..ba8ddbba3 100644 --- a/qcsrc/menu/xonotic/dialog_credits.qc +++ b/qcsrc/menu/xonotic/dialog_credits.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticCreditsDialog) EXTENDS(XonoticDialog) +CLASS(XonoticCreditsDialog, XonoticDialog) METHOD(XonoticCreditsDialog, fill, void(entity)) METHOD(XonoticCreditsDialog, focusEnter, void(entity)) ATTRIB(XonoticCreditsDialog, title, string, _("Credits")) diff --git a/qcsrc/menu/xonotic/dialog_firstrun.qc b/qcsrc/menu/xonotic/dialog_firstrun.qc index c9238a979..444478e73 100644 --- a/qcsrc/menu/xonotic/dialog_firstrun.qc +++ b/qcsrc/menu/xonotic/dialog_firstrun.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticFirstRunDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticFirstRunDialog, XonoticRootDialog) 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) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc b/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc index 307efdec0..87db1efd8 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDAmmoDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDAmmoDialog, XonoticRootDialog) METHOD(XonoticHUDAmmoDialog, fill, void(entity)) ATTRIB(XonoticHUDAmmoDialog, title, string, _("Ammo Panel")) ATTRIB(XonoticHUDAmmoDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_buffs.qc b/qcsrc/menu/xonotic/dialog_hudpanel_buffs.qc index 226bd9724..14193b5ef 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_buffs.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_buffs.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDBuffsDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDBuffsDialog, XonoticRootDialog) METHOD(XonoticHUDBuffsDialog, fill, void(entity)) ATTRIB(XonoticHUDBuffsDialog, title, string, _("Buffs Panel")) ATTRIB(XonoticHUDBuffsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc b/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc index bb7312f13..285754d86 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDCenterprintDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDCenterprintDialog, XonoticRootDialog) METHOD(XonoticHUDCenterprintDialog, fill, void(entity)) ATTRIB(XonoticHUDCenterprintDialog, title, string, _("Centerprint Panel")) ATTRIB(XonoticHUDCenterprintDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_chat.qc b/qcsrc/menu/xonotic/dialog_hudpanel_chat.qc index e16f76ac3..dd7701632 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_chat.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_chat.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDChatDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDChatDialog, XonoticRootDialog) METHOD(XonoticHUDChatDialog, fill, void(entity)) ATTRIB(XonoticHUDChatDialog, title, string, _("Chat Panel")) ATTRIB(XonoticHUDChatDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc b/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc index 534f1ebfe..ef314a4ff 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDEngineInfoDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDEngineInfoDialog, XonoticRootDialog) METHOD(XonoticHUDEngineInfoDialog, fill, void(entity)) ATTRIB(XonoticHUDEngineInfoDialog, title, string, _("Engine Info Panel")) ATTRIB(XonoticHUDEngineInfoDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc index dc864203b..f5656fa48 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDHealthArmorDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDHealthArmorDialog, XonoticRootDialog) METHOD(XonoticHUDHealthArmorDialog, fill, void(entity)) ATTRIB(XonoticHUDHealthArmorDialog, title, string, _("Health/Armor Panel")) ATTRIB(XonoticHUDHealthArmorDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc b/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc index b70553120..e25ce9a42 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDInfoMessagesDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDInfoMessagesDialog, XonoticRootDialog) METHOD(XonoticHUDInfoMessagesDialog, fill, void(entity)) ATTRIB(XonoticHUDInfoMessagesDialog, title, string, _("Info Messages Panel")) ATTRIB(XonoticHUDInfoMessagesDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc b/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc index 3133a7e83..05e06054e 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDModIconsDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDModIconsDialog, XonoticRootDialog) METHOD(XonoticHUDModIconsDialog, fill, void(entity)) ATTRIB(XonoticHUDModIconsDialog, title, string, _("Mod Icons Panel")) ATTRIB(XonoticHUDModIconsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_notification.qc b/qcsrc/menu/xonotic/dialog_hudpanel_notification.qc index 722b5d539..f5518508c 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_notification.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_notification.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDNotificationDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDNotificationDialog, XonoticRootDialog) METHOD(XonoticHUDNotificationDialog, fill, void(entity)) ATTRIB(XonoticHUDNotificationDialog, title, string, _("Notification Panel")) ATTRIB(XonoticHUDNotificationDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_physics.qc b/qcsrc/menu/xonotic/dialog_hudpanel_physics.qc index 6e4917d93..f6120dac3 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_physics.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_physics.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDPhysicsDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDPhysicsDialog, XonoticRootDialog) METHOD(XonoticHUDPhysicsDialog, fill, void(entity)) ATTRIB(XonoticHUDPhysicsDialog, title, string, _("Physics Panel")) ATTRIB(XonoticHUDPhysicsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc index 3449e0604..d97277142 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDPowerupsDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDPowerupsDialog, XonoticRootDialog) METHOD(XonoticHUDPowerupsDialog, fill, void(entity)) ATTRIB(XonoticHUDPowerupsDialog, title, string, _("Powerups Panel")) ATTRIB(XonoticHUDPowerupsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc index 79f581d13..0d025c969 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDPressedKeysDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDPressedKeysDialog, XonoticRootDialog) METHOD(XonoticHUDPressedKeysDialog, fill, void(entity)) ATTRIB(XonoticHUDPressedKeysDialog, title, string, _("Pressed Keys Panel")) ATTRIB(XonoticHUDPressedKeysDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc index b8ecbee59..1515a3365 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDRaceTimerDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDRaceTimerDialog, XonoticRootDialog) METHOD(XonoticHUDRaceTimerDialog, fill, void(entity)) ATTRIB(XonoticHUDRaceTimerDialog, title, string, _("Race Timer Panel")) ATTRIB(XonoticHUDRaceTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_radar.qc b/qcsrc/menu/xonotic/dialog_hudpanel_radar.qc index bdff50cb5..9e3eac3cf 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_radar.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_radar.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDRadarDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDRadarDialog, XonoticRootDialog) METHOD(XonoticHUDRadarDialog, fill, void(entity)) ATTRIB(XonoticHUDRadarDialog, title, string, _("Radar Panel")) ATTRIB(XonoticHUDRadarDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_score.qc b/qcsrc/menu/xonotic/dialog_hudpanel_score.qc index edd4da66e..95a53daa5 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_score.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_score.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDScoreDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDScoreDialog, XonoticRootDialog) METHOD(XonoticHUDScoreDialog, fill, void(entity)) ATTRIB(XonoticHUDScoreDialog, title, string, _("Score Panel")) ATTRIB(XonoticHUDScoreDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc b/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc index 754a5f100..7b7d60b0f 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDTimerDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDTimerDialog, XonoticRootDialog) METHOD(XonoticHUDTimerDialog, fill, void(entity)) ATTRIB(XonoticHUDTimerDialog, title, string, _("Timer Panel")) ATTRIB(XonoticHUDTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_vote.qc b/qcsrc/menu/xonotic/dialog_hudpanel_vote.qc index e2b398ef2..31ba3b550 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_vote.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_vote.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDVoteDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDVoteDialog, XonoticRootDialog) METHOD(XonoticHUDVoteDialog, fill, void(entity)) ATTRIB(XonoticHUDVoteDialog, title, string, _("Vote Panel")) ATTRIB(XonoticHUDVoteDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc index ce1479cb1..4164005c5 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDWeaponsDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDWeaponsDialog, XonoticRootDialog) METHOD(XonoticHUDWeaponsDialog, fill, void(entity)) ATTRIB(XonoticHUDWeaponsDialog, title, string, _("Weapons Panel")) ATTRIB(XonoticHUDWeaponsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc b/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc index 7cf0ea6da..249855cad 100644 --- a/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc +++ b/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDExitDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticHUDExitDialog, XonoticRootDialog) METHOD(XonoticHUDExitDialog, fill, void(entity)) ATTRIB(XonoticHUDExitDialog, title, string, _("Panel HUD Setup")) ATTRIB(XonoticHUDExitDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) diff --git a/qcsrc/menu/xonotic/dialog_monstertools.qc b/qcsrc/menu/xonotic/dialog_monstertools.qc index 8b67094a7..c288585a5 100644 --- a/qcsrc/menu/xonotic/dialog_monstertools.qc +++ b/qcsrc/menu/xonotic/dialog_monstertools.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticMonsterToolsDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticMonsterToolsDialog, XonoticRootDialog) METHOD(XonoticMonsterToolsDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls ATTRIB(XonoticMonsterToolsDialog, title, string, _("Monster Tools")) ATTRIB(XonoticMonsterToolsDialog, color, vector, SKINCOLOR_DIALOG_SANDBOXTOOLS) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer.qc b/qcsrc/menu/xonotic/dialog_multiplayer.qc index 7d234c7fe..d284041c5 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticMultiplayerDialog) EXTENDS(XonoticDialog) +CLASS(XonoticMultiplayerDialog, XonoticDialog) METHOD(XonoticMultiplayerDialog, fill, void(entity)) ATTRIB(XonoticMultiplayerDialog, title, string, _("Multiplayer")) ATTRIB(XonoticMultiplayerDialog, color, vector, SKINCOLOR_DIALOG_MULTIPLAYER) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc index d49cd3765..84ce8a1ab 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticServerCreateTab) EXTENDS(XonoticTab) +CLASS(XonoticServerCreateTab, XonoticTab) 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; } diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc index 90cbcac0d..ab6f42834 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticMapInfoDialog) EXTENDS(XonoticDialog) +CLASS(XonoticMapInfoDialog, XonoticDialog) METHOD(XonoticMapInfoDialog, fill, void(entity)) METHOD(XonoticMapInfoDialog, loadMapInfo, void(entity, float, entity)) ATTRIB(XonoticMapInfoDialog, title, string, _("Map Information")) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc index d7825e06a..9ac61ec28 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc @@ -1,7 +1,7 @@ #include "../../common/weapons/weapons.qh" #ifdef INTERFACE -CLASS(XonoticMutatorsDialog) EXTENDS(XonoticDialog) +CLASS(XonoticMutatorsDialog, XonoticDialog) METHOD(XonoticMutatorsDialog, toString, string(entity)) METHOD(XonoticMutatorsDialog, fill, void(entity)) METHOD(XonoticMutatorsDialog, showNotify, void(entity)) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc index 4636ebbdb..76b1e064a 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticServerListTab) EXTENDS(XonoticTab) +CLASS(XonoticServerListTab, XonoticTab) 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; } diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc index dabb1be54..74b8df6a6 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc @@ -1,7 +1,7 @@ #include "../../common/mapinfo.qh" #ifdef INTERFACE -CLASS(XonoticServerInfoDialog) EXTENDS(XonoticDialog) +CLASS(XonoticServerInfoDialog, XonoticDialog) METHOD(XonoticServerInfoDialog, fill, void(entity)) METHOD(XonoticServerInfoDialog, loadServerInfo, void(entity, float)) ATTRIB(XonoticServerInfoDialog, title, string, _("Server Information")) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media.qc index 1ec0c76e9..c17fdd75d 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticMediaTab) EXTENDS(XonoticTab) +CLASS(XonoticMediaTab, XonoticTab) 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; } diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc index ab2886a28..e79885e64 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticDemoBrowserTab) EXTENDS(XonoticTab) +CLASS(XonoticDemoBrowserTab, XonoticTab) 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; } diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc index 136997eec..7fa2072de 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticDemoStartConfirmDialog) EXTENDS(XonoticDialog) +CLASS(XonoticDemoStartConfirmDialog, XonoticDialog) METHOD(XonoticDemoStartConfirmDialog, fill, void(entity)) ATTRIB(XonoticDemoStartConfirmDialog, title, string, _("Disconnect")) ATTRIB(XonoticDemoStartConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc index 5c9bf8cb3..d71ad6f2e 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticDemoTimeConfirmDialog) EXTENDS(XonoticDialog) +CLASS(XonoticDemoTimeConfirmDialog, XonoticDialog) METHOD(XonoticDemoTimeConfirmDialog, fill, void(entity)) ATTRIB(XonoticDemoTimeConfirmDialog, title, string, _("Disconnect")) ATTRIB(XonoticDemoTimeConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc index 0b7e4231c..ddb83e0a3 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticMusicPlayerTab) EXTENDS(XonoticTab) +CLASS(XonoticMusicPlayerTab, XonoticTab) 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; } diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc index 89a76b608..f072645a9 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticScreenshotBrowserTab) EXTENDS(XonoticTab) +CLASS(XonoticScreenshotBrowserTab, XonoticTab) 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; } diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc index bcf168a93..dd47da811 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticScreenshotViewerDialog) EXTENDS(XonoticDialog) +CLASS(XonoticScreenshotViewerDialog, XonoticDialog) METHOD(XonoticScreenshotViewerDialog, fill, void(entity)) METHOD(XonoticScreenshotViewerDialog, keyDown, float(entity, float, float, float)) METHOD(XonoticScreenshotViewerDialog, loadScreenshot, void(entity, string)) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc index 8c2488543..8c6fc8025 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticProfileTab) EXTENDS(XonoticTab) +CLASS(XonoticProfileTab, XonoticTab) 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; } diff --git a/qcsrc/menu/xonotic/dialog_quit.qc b/qcsrc/menu/xonotic/dialog_quit.qc index 71de59dac..3c4013d95 100644 --- a/qcsrc/menu/xonotic/dialog_quit.qc +++ b/qcsrc/menu/xonotic/dialog_quit.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticQuitDialog) EXTENDS(XonoticDialog) +CLASS(XonoticQuitDialog, XonoticDialog) METHOD(XonoticQuitDialog, fill, void(entity)) ATTRIB(XonoticQuitDialog, title, string, _("Quit")) ATTRIB(XonoticQuitDialog, color, vector, SKINCOLOR_DIALOG_QUIT) diff --git a/qcsrc/menu/xonotic/dialog_sandboxtools.qc b/qcsrc/menu/xonotic/dialog_sandboxtools.qc index fa7f40aea..30a353704 100644 --- a/qcsrc/menu/xonotic/dialog_sandboxtools.qc +++ b/qcsrc/menu/xonotic/dialog_sandboxtools.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticSandboxToolsDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticSandboxToolsDialog, XonoticRootDialog) METHOD(XonoticSandboxToolsDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls ATTRIB(XonoticSandboxToolsDialog, title, string, _("Sandbox Tools")) // ;) ATTRIB(XonoticSandboxToolsDialog, color, vector, SKINCOLOR_DIALOG_SANDBOXTOOLS) diff --git a/qcsrc/menu/xonotic/dialog_settings.qc b/qcsrc/menu/xonotic/dialog_settings.qc index a992e8059..16e00f7eb 100644 --- a/qcsrc/menu/xonotic/dialog_settings.qc +++ b/qcsrc/menu/xonotic/dialog_settings.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticSettingsDialog) EXTENDS(XonoticDialog) +CLASS(XonoticSettingsDialog, XonoticDialog) METHOD(XonoticSettingsDialog, fill, void(entity)) ATTRIB(XonoticSettingsDialog, title, string, _("Settings")) ATTRIB(XonoticSettingsDialog, color, vector, SKINCOLOR_DIALOG_SETTINGS) diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.qc b/qcsrc/menu/xonotic/dialog_settings_audio.qc index cccaa2652..2245edbd4 100644 --- a/qcsrc/menu/xonotic/dialog_settings_audio.qc +++ b/qcsrc/menu/xonotic/dialog_settings_audio.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticAudioSettingsTab) EXTENDS(XonoticTab) +CLASS(XonoticAudioSettingsTab, XonoticTab) 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; } diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.qc b/qcsrc/menu/xonotic/dialog_settings_effects.qc index fcbbbbe0e..109dd2763 100644 --- a/qcsrc/menu/xonotic/dialog_settings_effects.qc +++ b/qcsrc/menu/xonotic/dialog_settings_effects.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticEffectsSettingsTab) EXTENDS(XonoticTab) +CLASS(XonoticEffectsSettingsTab, XonoticTab) 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; } diff --git a/qcsrc/menu/xonotic/dialog_settings_game.qc b/qcsrc/menu/xonotic/dialog_settings_game.qc index 5fb563ebd..d2db0ab06 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticGameSettingsTab) EXTENDS(XonoticTab) +CLASS(XonoticGameSettingsTab, XonoticTab) 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; } diff --git a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc index 28cf3708f..b51f61b9a 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticGameCrosshairSettingsTab) EXTENDS(XonoticTab) +CLASS(XonoticGameCrosshairSettingsTab, XonoticTab) //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; } diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc index bb0587184..7489207a1 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticGameHUDSettingsTab) EXTENDS(XonoticTab) +CLASS(XonoticGameHUDSettingsTab, XonoticTab) //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; } diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc b/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc index 12312c36b..9bf5130ab 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticHUDConfirmDialog) EXTENDS(XonoticDialog) +CLASS(XonoticHUDConfirmDialog, XonoticDialog) METHOD(XonoticHUDConfirmDialog, fill, void(entity)) ATTRIB(XonoticHUDConfirmDialog, title, string, _("Enter HUD editor")) ATTRIB(XonoticHUDConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_messages.qc b/qcsrc/menu/xonotic/dialog_settings_game_messages.qc index 034608d09..1c2ee73f5 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_messages.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticGameMessageSettingsTab) EXTENDS(XonoticTab) +CLASS(XonoticGameMessageSettingsTab, XonoticTab) //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; } diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.qc b/qcsrc/menu/xonotic/dialog_settings_game_model.qc index 1f9a23f2e..404215e30 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_model.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_model.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticGameModelSettingsTab) EXTENDS(XonoticTab) +CLASS(XonoticGameModelSettingsTab, XonoticTab) //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; } diff --git a/qcsrc/menu/xonotic/dialog_settings_game_view.qc b/qcsrc/menu/xonotic/dialog_settings_game_view.qc index 44e741934..b09380092 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_view.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_view.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticGameViewSettingsTab) EXTENDS(XonoticTab) +CLASS(XonoticGameViewSettingsTab, XonoticTab) //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; } diff --git a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc index bc7cc7d7f..739c186b1 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticGameWeaponsSettingsTab) EXTENDS(XonoticTab) +CLASS(XonoticGameWeaponsSettingsTab, XonoticTab) //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; } diff --git a/qcsrc/menu/xonotic/dialog_settings_input.qc b/qcsrc/menu/xonotic/dialog_settings_input.qc index b4ac61348..90cc13484 100644 --- a/qcsrc/menu/xonotic/dialog_settings_input.qc +++ b/qcsrc/menu/xonotic/dialog_settings_input.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticInputSettingsTab) EXTENDS(XonoticTab) +CLASS(XonoticInputSettingsTab, XonoticTab) 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; } diff --git a/qcsrc/menu/xonotic/dialog_settings_input_userbind.qc b/qcsrc/menu/xonotic/dialog_settings_input_userbind.qc index aaf182fcd..4bc26b2e4 100644 --- a/qcsrc/menu/xonotic/dialog_settings_input_userbind.qc +++ b/qcsrc/menu/xonotic/dialog_settings_input_userbind.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticUserbindEditDialog) EXTENDS(XonoticDialog) +CLASS(XonoticUserbindEditDialog, XonoticDialog) METHOD(XonoticUserbindEditDialog, loadUserBind, void(entity, string, string, string)) METHOD(XonoticUserbindEditDialog, fill, void(entity)) ATTRIB(XonoticUserbindEditDialog, title, string, _("User defined key bind")) diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.qc b/qcsrc/menu/xonotic/dialog_settings_misc.qc index 2ea9c1e9c..2372e3208 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc.qc +++ b/qcsrc/menu/xonotic/dialog_settings_misc.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticMiscSettingsTab) EXTENDS(XonoticTab) +CLASS(XonoticMiscSettingsTab, XonoticTab) 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; } diff --git a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc index c2ea2a5b6..2993fa30e 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc +++ b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticCvarsDialog) EXTENDS(XonoticDialog) +CLASS(XonoticCvarsDialog, XonoticDialog) METHOD(XonoticCvarsDialog, fill, void(entity)) METHOD(XonoticCvarsDialog, showNotify, void(entity)) ATTRIB(XonoticCvarsDialog, title, string, _("Advanced settings")) diff --git a/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc b/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc index 8f6da0a55..19a874354 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc +++ b/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticResetDialog) EXTENDS(XonoticDialog) +CLASS(XonoticResetDialog, XonoticDialog) METHOD(XonoticResetDialog, fill, void(entity)) ATTRIB(XonoticResetDialog, title, string, _("Factory reset")) ATTRIB(XonoticResetDialog, color, vector, SKINCOLOR_DIALOG_QUIT) diff --git a/qcsrc/menu/xonotic/dialog_settings_user.qc b/qcsrc/menu/xonotic/dialog_settings_user.qc index 180efccb9..9e2b0d034 100644 --- a/qcsrc/menu/xonotic/dialog_settings_user.qc +++ b/qcsrc/menu/xonotic/dialog_settings_user.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticUserSettingsTab) EXTENDS(XonoticTab) +CLASS(XonoticUserSettingsTab, XonoticTab) 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; } diff --git a/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc b/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc index c830b5583..24644c0ac 100644 --- a/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc +++ b/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticLanguageWarningDialog) EXTENDS(XonoticDialog) +CLASS(XonoticLanguageWarningDialog, XonoticDialog) 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) diff --git a/qcsrc/menu/xonotic/dialog_settings_video.qc b/qcsrc/menu/xonotic/dialog_settings_video.qc index 36929cbd7..7a22cf4a8 100644 --- a/qcsrc/menu/xonotic/dialog_settings_video.qc +++ b/qcsrc/menu/xonotic/dialog_settings_video.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticVideoSettingsTab) EXTENDS(XonoticTab) +CLASS(XonoticVideoSettingsTab, XonoticTab) 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; } diff --git a/qcsrc/menu/xonotic/dialog_singleplayer.qc b/qcsrc/menu/xonotic/dialog_singleplayer.qc index 6e13f65b8..978e3adc3 100644 --- a/qcsrc/menu/xonotic/dialog_singleplayer.qc +++ b/qcsrc/menu/xonotic/dialog_singleplayer.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticSingleplayerDialog) EXTENDS(XonoticDialog) +CLASS(XonoticSingleplayerDialog, XonoticDialog) METHOD(XonoticSingleplayerDialog, fill, void(entity)) ATTRIB(XonoticSingleplayerDialog, title, string, _("Singleplayer")) ATTRIB(XonoticSingleplayerDialog, color, vector, SKINCOLOR_DIALOG_SINGLEPLAYER) diff --git a/qcsrc/menu/xonotic/dialog_singleplayer_winner.qc b/qcsrc/menu/xonotic/dialog_singleplayer_winner.qc index 0d1c05af4..275cc0433 100644 --- a/qcsrc/menu/xonotic/dialog_singleplayer_winner.qc +++ b/qcsrc/menu/xonotic/dialog_singleplayer_winner.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticWinnerDialog) EXTENDS(XonoticDialog) +CLASS(XonoticWinnerDialog, XonoticDialog) METHOD(XonoticWinnerDialog, fill, void(entity)) METHOD(XonoticWinnerDialog, focusEnter, void(entity)) ATTRIB(XonoticWinnerDialog, title, string, _("Winner")) diff --git a/qcsrc/menu/xonotic/dialog_teamselect.qc b/qcsrc/menu/xonotic/dialog_teamselect.qc index 1ab68c3fb..cab938185 100644 --- a/qcsrc/menu/xonotic/dialog_teamselect.qc +++ b/qcsrc/menu/xonotic/dialog_teamselect.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticTeamSelectDialog) EXTENDS(XonoticRootDialog) +CLASS(XonoticTeamSelectDialog, XonoticRootDialog) 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")) // ;) diff --git a/qcsrc/menu/xonotic/gametypebutton.qc b/qcsrc/menu/xonotic/gametypebutton.qc index cc10f3da9..aaa46eaf7 100644 --- a/qcsrc/menu/xonotic/gametypebutton.qc +++ b/qcsrc/menu/xonotic/gametypebutton.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticGametypeButton) EXTENDS(RadioButton) +CLASS(XonoticGametypeButton, RadioButton) 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; } diff --git a/qcsrc/menu/xonotic/gametypelist.qc b/qcsrc/menu/xonotic/gametypelist.qc index 0d36c8363..faaa177ca 100644 --- a/qcsrc/menu/xonotic/gametypelist.qc +++ b/qcsrc/menu/xonotic/gametypelist.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticGametypeList) EXTENDS(XonoticListBox) +CLASS(XonoticGametypeList, XonoticListBox) 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; } diff --git a/qcsrc/menu/xonotic/image.qc b/qcsrc/menu/xonotic/image.qc index 9f0de67b8..2e51d8997 100644 --- a/qcsrc/menu/xonotic/image.qc +++ b/qcsrc/menu/xonotic/image.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticImage) EXTENDS(Image) +CLASS(XonoticImage, Image) 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; } diff --git a/qcsrc/menu/xonotic/inputbox.qc b/qcsrc/menu/xonotic/inputbox.qc index fef5311c7..b15e475a1 100644 --- a/qcsrc/menu/xonotic/inputbox.qc +++ b/qcsrc/menu/xonotic/inputbox.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticInputBox) EXTENDS(InputBox) +CLASS(XonoticInputBox, InputBox) 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; } diff --git a/qcsrc/menu/xonotic/keybinder.qc b/qcsrc/menu/xonotic/keybinder.qc index 5c2b898f2..e06969610 100644 --- a/qcsrc/menu/xonotic/keybinder.qc +++ b/qcsrc/menu/xonotic/keybinder.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticKeyBinder) EXTENDS(XonoticListBox) +CLASS(XonoticKeyBinder, XonoticListBox) 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; } diff --git a/qcsrc/menu/xonotic/languagelist.qc b/qcsrc/menu/xonotic/languagelist.qc index 8aa0d2c07..85461e63e 100644 --- a/qcsrc/menu/xonotic/languagelist.qc +++ b/qcsrc/menu/xonotic/languagelist.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticLanguageList) EXTENDS(XonoticListBox) +CLASS(XonoticLanguageList, XonoticListBox) 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; } diff --git a/qcsrc/menu/xonotic/listbox.qc b/qcsrc/menu/xonotic/listbox.qc index 0ab574fa2..d3897f572 100644 --- a/qcsrc/menu/xonotic/listbox.qc +++ b/qcsrc/menu/xonotic/listbox.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticListBox) EXTENDS(ListBox) +CLASS(XonoticListBox, ListBox) 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; } diff --git a/qcsrc/menu/xonotic/mainwindow.qc b/qcsrc/menu/xonotic/mainwindow.qc index 45a0f93dc..ea126beb5 100644 --- a/qcsrc/menu/xonotic/mainwindow.qc +++ b/qcsrc/menu/xonotic/mainwindow.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(MainWindow) EXTENDS(ModalController) +CLASS(MainWindow, ModalController) 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); diff --git a/qcsrc/menu/xonotic/maplist.qc b/qcsrc/menu/xonotic/maplist.qc index d88ad0e8e..9bcc1afc4 100644 --- a/qcsrc/menu/xonotic/maplist.qc +++ b/qcsrc/menu/xonotic/maplist.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticMapList) EXTENDS(XonoticListBox) +CLASS(XonoticMapList, XonoticListBox) 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; } diff --git a/qcsrc/menu/xonotic/nexposee.qc b/qcsrc/menu/xonotic/nexposee.qc index b375393c0..2bbd8db0a 100644 --- a/qcsrc/menu/xonotic/nexposee.qc +++ b/qcsrc/menu/xonotic/nexposee.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticNexposee) EXTENDS(Nexposee) +CLASS(XonoticNexposee, Nexposee) 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; } diff --git a/qcsrc/menu/xonotic/playerlist.qc b/qcsrc/menu/xonotic/playerlist.qc index d4dc5af05..3c0481471 100644 --- a/qcsrc/menu/xonotic/playerlist.qc +++ b/qcsrc/menu/xonotic/playerlist.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticPlayerList) EXTENDS(XonoticListBox) +CLASS(XonoticPlayerList, XonoticListBox) 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; } diff --git a/qcsrc/menu/xonotic/playermodel.qc b/qcsrc/menu/xonotic/playermodel.qc index f498f8d21..73d6dd28c 100644 --- a/qcsrc/menu/xonotic/playermodel.qc +++ b/qcsrc/menu/xonotic/playermodel.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticPlayerModelSelector) EXTENDS(XonoticImage) +CLASS(XonoticPlayerModelSelector, XonoticImage) 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; } diff --git a/qcsrc/menu/xonotic/playlist.qc b/qcsrc/menu/xonotic/playlist.qc index fbe3c92c6..5d71755d0 100644 --- a/qcsrc/menu/xonotic/playlist.qc +++ b/qcsrc/menu/xonotic/playlist.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticPlayList) EXTENDS(XonoticListBox) +CLASS(XonoticPlayList, XonoticListBox) 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; } diff --git a/qcsrc/menu/xonotic/radiobutton.qc b/qcsrc/menu/xonotic/radiobutton.qc index 85cc4fc5c..000da90e3 100644 --- a/qcsrc/menu/xonotic/radiobutton.qc +++ b/qcsrc/menu/xonotic/radiobutton.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticRadioButton) EXTENDS(RadioButton) +CLASS(XonoticRadioButton, RadioButton) 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; } diff --git a/qcsrc/menu/xonotic/rootdialog.qc b/qcsrc/menu/xonotic/rootdialog.qc index e8c9db364..954cb7304 100644 --- a/qcsrc/menu/xonotic/rootdialog.qc +++ b/qcsrc/menu/xonotic/rootdialog.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticRootDialog) EXTENDS(XonoticDialog) +CLASS(XonoticRootDialog, XonoticDialog) // still to be customized by user /* ATTRIB(XonoticDialog, closable, float, 1) diff --git a/qcsrc/menu/xonotic/screenshotimage.qc b/qcsrc/menu/xonotic/screenshotimage.qc index a800a8494..756c1a449 100644 --- a/qcsrc/menu/xonotic/screenshotimage.qc +++ b/qcsrc/menu/xonotic/screenshotimage.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticScreenshotImage) EXTENDS(XonoticImage) +CLASS(XonoticScreenshotImage, XonoticImage) 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; } diff --git a/qcsrc/menu/xonotic/screenshotlist.qc b/qcsrc/menu/xonotic/screenshotlist.qc index 225eefb24..8730fa8dd 100644 --- a/qcsrc/menu/xonotic/screenshotlist.qc +++ b/qcsrc/menu/xonotic/screenshotlist.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticScreenshotList) EXTENDS(XonoticListBox) +CLASS(XonoticScreenshotList, XonoticListBox) 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; } diff --git a/qcsrc/menu/xonotic/serverlist.qc b/qcsrc/menu/xonotic/serverlist.qc index 29877c5d5..7837693b4 100644 --- a/qcsrc/menu/xonotic/serverlist.qc +++ b/qcsrc/menu/xonotic/serverlist.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticServerList) EXTENDS(XonoticListBox) +CLASS(XonoticServerList, XonoticListBox) 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; } diff --git a/qcsrc/menu/xonotic/skinlist.qc b/qcsrc/menu/xonotic/skinlist.qc index 9990c83fe..f667a8847 100644 --- a/qcsrc/menu/xonotic/skinlist.qc +++ b/qcsrc/menu/xonotic/skinlist.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticSkinList) EXTENDS(XonoticListBox) +CLASS(XonoticSkinList, XonoticListBox) 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; } diff --git a/qcsrc/menu/xonotic/slider.qc b/qcsrc/menu/xonotic/slider.qc index d63fe1c33..8130534eb 100644 --- a/qcsrc/menu/xonotic/slider.qc +++ b/qcsrc/menu/xonotic/slider.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticSlider) EXTENDS(Slider) +CLASS(XonoticSlider, Slider) 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; } diff --git a/qcsrc/menu/xonotic/slider_decibels.qc b/qcsrc/menu/xonotic/slider_decibels.qc index 07632320e..e3e77c319 100644 --- a/qcsrc/menu/xonotic/slider_decibels.qc +++ b/qcsrc/menu/xonotic/slider_decibels.qc @@ -1,7 +1,7 @@ #include "../../warpzonelib/mathlib.qh" #ifdef INTERFACE -CLASS(XonoticDecibelsSlider) EXTENDS(XonoticSlider) +CLASS(XonoticDecibelsSlider, XonoticSlider) 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; } diff --git a/qcsrc/menu/xonotic/slider_particles.qc b/qcsrc/menu/xonotic/slider_particles.qc index 818dcb84b..0bfe05c5d 100644 --- a/qcsrc/menu/xonotic/slider_particles.qc +++ b/qcsrc/menu/xonotic/slider_particles.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticParticlesSlider) EXTENDS(XonoticTextSlider) +CLASS(XonoticParticlesSlider, XonoticTextSlider) 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; } diff --git a/qcsrc/menu/xonotic/slider_picmip.qc b/qcsrc/menu/xonotic/slider_picmip.qc index ddedc4bab..201da72d5 100644 --- a/qcsrc/menu/xonotic/slider_picmip.qc +++ b/qcsrc/menu/xonotic/slider_picmip.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticPicmipSlider) EXTENDS(XonoticTextSlider) +CLASS(XonoticPicmipSlider, XonoticTextSlider) 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; } diff --git a/qcsrc/menu/xonotic/slider_resolution.qc b/qcsrc/menu/xonotic/slider_resolution.qc index c14436281..b15e13096 100644 --- a/qcsrc/menu/xonotic/slider_resolution.qc +++ b/qcsrc/menu/xonotic/slider_resolution.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticResolutionSlider) EXTENDS(XonoticTextSlider) +CLASS(XonoticResolutionSlider, XonoticTextSlider) 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; } diff --git a/qcsrc/menu/xonotic/slider_sbfadetime.qc b/qcsrc/menu/xonotic/slider_sbfadetime.qc index 39f91f933..03d3e3402 100644 --- a/qcsrc/menu/xonotic/slider_sbfadetime.qc +++ b/qcsrc/menu/xonotic/slider_sbfadetime.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticScoreboardFadeTimeSlider) EXTENDS(XonoticTextSlider) +CLASS(XonoticScoreboardFadeTimeSlider, XonoticTextSlider) 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; } diff --git a/qcsrc/menu/xonotic/soundlist.qc b/qcsrc/menu/xonotic/soundlist.qc index e443a53ef..ae859779e 100644 --- a/qcsrc/menu/xonotic/soundlist.qc +++ b/qcsrc/menu/xonotic/soundlist.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticSoundList) EXTENDS(XonoticListBox) +CLASS(XonoticSoundList, XonoticListBox) 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; } diff --git a/qcsrc/menu/xonotic/statslist.qc b/qcsrc/menu/xonotic/statslist.qc index 99c850f13..ab22ff0c7 100644 --- a/qcsrc/menu/xonotic/statslist.qc +++ b/qcsrc/menu/xonotic/statslist.qc @@ -2,7 +2,7 @@ #include "../../common/playerstats.qh" #ifdef INTERFACE -CLASS(XonoticStatsList) EXTENDS(XonoticListBox) +CLASS(XonoticStatsList, XonoticListBox) 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; } diff --git a/qcsrc/menu/xonotic/tab.qc b/qcsrc/menu/xonotic/tab.qc index d1a867a2f..fd4b50cc3 100644 --- a/qcsrc/menu/xonotic/tab.qc +++ b/qcsrc/menu/xonotic/tab.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticTab) EXTENDS(Tab) +CLASS(XonoticTab, Tab) // still to be customized by user /* ATTRIB(XonoticTab, intendedWidth, float, 0) diff --git a/qcsrc/menu/xonotic/tabcontroller.qc b/qcsrc/menu/xonotic/tabcontroller.qc index 1faa625ae..d3aba3331 100644 --- a/qcsrc/menu/xonotic/tabcontroller.qc +++ b/qcsrc/menu/xonotic/tabcontroller.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticTabController) EXTENDS(ModalController) +CLASS(XonoticTabController, ModalController) 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; } diff --git a/qcsrc/menu/xonotic/textlabel.qc b/qcsrc/menu/xonotic/textlabel.qc index cb54da19e..7bab8c406 100644 --- a/qcsrc/menu/xonotic/textlabel.qc +++ b/qcsrc/menu/xonotic/textlabel.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticTextLabel) EXTENDS(Label) +CLASS(XonoticTextLabel, Label) 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; } diff --git a/qcsrc/menu/xonotic/textslider.qc b/qcsrc/menu/xonotic/textslider.qc index dabd1b1a6..131f35be1 100644 --- a/qcsrc/menu/xonotic/textslider.qc +++ b/qcsrc/menu/xonotic/textslider.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticTextSlider) EXTENDS(TextSlider) +CLASS(XonoticTextSlider, TextSlider) 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; } diff --git a/qcsrc/menu/xonotic/weaponarenacheckbox.qc b/qcsrc/menu/xonotic/weaponarenacheckbox.qc index a7d71f0d2..21aa1f4e2 100644 --- a/qcsrc/menu/xonotic/weaponarenacheckbox.qc +++ b/qcsrc/menu/xonotic/weaponarenacheckbox.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticWeaponarenaCheckBox) EXTENDS(CheckBox) +CLASS(XonoticWeaponarenaCheckBox, CheckBox) 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; } diff --git a/qcsrc/menu/xonotic/weaponslist.qc b/qcsrc/menu/xonotic/weaponslist.qc index 46d4e273f..a82f2525e 100644 --- a/qcsrc/menu/xonotic/weaponslist.qc +++ b/qcsrc/menu/xonotic/weaponslist.qc @@ -1,5 +1,5 @@ #ifdef INTERFACE -CLASS(XonoticWeaponsList) EXTENDS(XonoticListBox) +CLASS(XonoticWeaponsList, XonoticListBox) 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; }