From 365a0e5ad3869afd6805d6d72c0cd27f843fbcd8 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 17 Jun 2010 09:02:51 +0200 Subject: [PATCH] let's USE the super keyword! yay! --- qcsrc/menu/item/borderimage.c | 6 ++--- qcsrc/menu/item/button.c | 6 ++--- qcsrc/menu/item/checkbox.c | 4 +-- qcsrc/menu/item/container.c | 2 +- qcsrc/menu/item/dialog.c | 2 +- qcsrc/menu/item/gecko.c | 2 +- qcsrc/menu/item/image.c | 2 +- qcsrc/menu/item/inputbox.c | 6 ++--- qcsrc/menu/item/inputcontainer.c | 14 +++++----- qcsrc/menu/item/label.c | 2 +- qcsrc/menu/item/listbox.c | 2 +- qcsrc/menu/item/modalcontroller.c | 4 +-- qcsrc/menu/item/nexposee.c | 26 +++++++++---------- qcsrc/menu/item/slider.c | 6 ++--- qcsrc/menu/item/textslider.c | 4 +-- qcsrc/menu/xonotic/campaign.c | 8 +++--- qcsrc/menu/xonotic/charmap.c | 2 +- qcsrc/menu/xonotic/checkbox_slider_invalid.c | 2 +- qcsrc/menu/xonotic/colorbutton.c | 2 +- qcsrc/menu/xonotic/colorpicker.c | 2 +- qcsrc/menu/xonotic/credits.c | 6 ++--- qcsrc/menu/xonotic/crosshairbutton.c | 2 +- qcsrc/menu/xonotic/cvarlist.c | 6 ++--- qcsrc/menu/xonotic/demolist.c | 4 +-- qcsrc/menu/xonotic/dialog.c | 2 +- .../dialog_multiplayer_create_advanced.c | 2 +- .../dialog_multiplayer_create_mutators.c | 2 +- .../xonotic/dialog_multiplayer_playersetup.c | 2 +- qcsrc/menu/xonotic/inputbox.c | 8 +++--- qcsrc/menu/xonotic/keybinder.c | 6 ++--- qcsrc/menu/xonotic/listbox.c | 2 +- qcsrc/menu/xonotic/maplist.c | 6 ++--- qcsrc/menu/xonotic/playerlist.c | 2 +- qcsrc/menu/xonotic/playermodel.c | 4 +-- qcsrc/menu/xonotic/radiobutton.c | 2 +- qcsrc/menu/xonotic/serverlist.c | 8 +++--- qcsrc/menu/xonotic/skinlist.c | 4 +-- qcsrc/menu/xonotic/slider.c | 2 +- qcsrc/menu/xonotic/slider_decibels.c | 2 +- qcsrc/menu/xonotic/tab.c | 2 +- qcsrc/menu/xonotic/textlabel.c | 2 +- qcsrc/menu/xonotic/textslider.c | 2 +- qcsrc/menu/xonotic/weaponslist.c | 8 +++--- 43 files changed, 95 insertions(+), 95 deletions(-) diff --git a/qcsrc/menu/item/borderimage.c b/qcsrc/menu/item/borderimage.c index 1bb458ad1..7083f6527 100644 --- a/qcsrc/menu/item/borderimage.c +++ b/qcsrc/menu/item/borderimage.c @@ -30,12 +30,12 @@ void resizeNotifyBorderImage(entity me, vector relOrigin, vector relSize, vector { vector scrs; scrs = eX * conwidth + eY * conheight; - resizeNotifyLabel(me, relOrigin, relSize, boxToGlobal(me.parent.Nexposee_smallOrigin, '0 0 0', scrs), boxToGlobalSize(me.parent.Nexposee_smallSize, scrs)); + SUPER(BorderImage).resizeNotify(me, relOrigin, relSize, boxToGlobal(me.parent.Nexposee_smallOrigin, '0 0 0', scrs), boxToGlobalSize(me.parent.Nexposee_smallSize, scrs)); me.realOrigin_y = me.realFontSize_y * me.zoomedOutTitleBarPosition; me.realOrigin_Nexposeed = me.realOrigin; me.realFontSize_Nexposeed = me.realFontSize; } - resizeNotifyLabel(me, relOrigin, relSize, absOrigin, absSize); + SUPER(BorderImage).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); me.borderVec = me.borderHeight / absSize_y * (eY + eX * (absSize_y / absSize_x)); me.realOrigin_y = 0.5 * (me.borderVec_y - me.realFontSize_y); if(me.closeButton) @@ -76,7 +76,7 @@ void drawBorderImage(entity me) draw_fontscale = globalToBoxSize(boxToGlobalSize(df, me.realFontSize), rf); } - drawLabel(me); + SUPER(BorderImage).draw(me); if(me.isNexposeeTitleBar) { diff --git a/qcsrc/menu/item/button.c b/qcsrc/menu/item/button.c index 096c75b80..b63928fd4 100644 --- a/qcsrc/menu/item/button.c +++ b/qcsrc/menu/item/button.c @@ -41,11 +41,11 @@ void resizeNotifyButton(entity me, vector relOrigin, vector relSize, vector absO me.keepspaceLeft = 0; else me.keepspaceLeft = min(0.8, absSize_y / absSize_x); - resizeNotifyLabel(me, relOrigin, relSize, absOrigin, absSize); + SUPER(Button).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); } void configureButtonButton(entity me, string txt, float sz, string gfx) { - configureLabelLabel(me, txt, sz, me.srcMulti ? 0.5 : 0); + SUPER(Button).configureLabel(me, txt, sz, me.srcMulti ? 0.5 : 0); me.src = gfx; } float keyDownButton(entity me, float key, float ascii, float shift) @@ -150,7 +150,7 @@ void drawButton(entity me) draw_alpha = save; - drawLabel(me); + SUPER(Button).draw(me); if(me.clickTime > 0 && me.clickTime <= frametime) { diff --git a/qcsrc/menu/item/checkbox.c b/qcsrc/menu/item/checkbox.c index 40fa6675b..adbedf95a 100644 --- a/qcsrc/menu/item/checkbox.c +++ b/qcsrc/menu/item/checkbox.c @@ -24,7 +24,7 @@ void CheckBox_Click(entity me, entity other) } string toStringCheckBox(entity me) { - return strcat(toStringLabel(me), ", ", me.checked ? "checked" : "unchecked"); + return strcat(SUPER(CheckBox).toString(me), ", ", me.checked ? "checked" : "unchecked"); } void configureCheckBoxCheckBox(entity me, string txt, float sz, string gfx) { @@ -42,7 +42,7 @@ void drawCheckBox(entity me) } else me.srcSuffix = (me.checked ? "1" : "0"); - drawButton(me); + SUPER(CheckBox).draw(me); me.pressed = s; } #endif diff --git a/qcsrc/menu/item/container.c b/qcsrc/menu/item/container.c index 53e3eaa1a..0984b3718 100644 --- a/qcsrc/menu/item/container.c +++ b/qcsrc/menu/item/container.c @@ -98,7 +98,7 @@ void resizeNotifyLieContainer(entity me, vector relOrigin, vector relSize, vecto } } while(d); - resizeNotifyItem(me, relOrigin, relSize, absOrigin, absSize); + SUPER(Container).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); } void resizeNotifyContainer(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) diff --git a/qcsrc/menu/item/dialog.c b/qcsrc/menu/item/dialog.c index 7733a6030..20651f87f 100644 --- a/qcsrc/menu/item/dialog.c +++ b/qcsrc/menu/item/dialog.c @@ -186,6 +186,6 @@ float keyDownDialog(entity me, float key, float ascii, float shift) return 1; } } - return keyDownInputContainer(me, key, ascii, shift); + return SUPER(Dialog).keyDown(me, key, ascii, shift); } #endif diff --git a/qcsrc/menu/item/gecko.c b/qcsrc/menu/item/gecko.c index 10e0c2fee..5f3091263 100644 --- a/qcsrc/menu/item/gecko.c +++ b/qcsrc/menu/item/gecko.c @@ -83,7 +83,7 @@ float mouseDragGecko(entity me, vector pos) void resizeNotifyGecko(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { - resizeNotifyItem(me, relOrigin, relSize, absOrigin, absSize); + SUPER(Gecko).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); gecko_resize( me.texturePath, absSize_x, absSize_y ); me.textureExtent = gecko_get_texture_extent( me.texturePath ); } diff --git a/qcsrc/menu/item/image.c b/qcsrc/menu/item/image.c index c60ec232f..e44f39efb 100644 --- a/qcsrc/menu/item/image.c +++ b/qcsrc/menu/item/image.c @@ -61,7 +61,7 @@ void updateAspectImage(entity me) } void resizeNotifyImage(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { - resizeNotifyItem(me, relOrigin, relSize, absOrigin, absSize); + SUPER(Image).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); me.updateAspect(me); } #endif diff --git a/qcsrc/menu/item/inputbox.c b/qcsrc/menu/item/inputbox.c index 03e1605da..e34e5ff52 100644 --- a/qcsrc/menu/item/inputbox.c +++ b/qcsrc/menu/item/inputbox.c @@ -33,7 +33,7 @@ void InputBox_Clear_Click(entity btn, entity me); #ifdef IMPLEMENTATION void configureInputBoxInputBox(entity me, string theText, float theCursorPos, float theFontSize, string gfx) { - configureLabelLabel(me, theText, theFontSize, 0.0); + SUPER(InputBox).configureLabel(me, theText, theFontSize, 0.0); me.src = gfx; me.cursorPos = theCursorPos; } @@ -42,7 +42,7 @@ void setTextInputBox(entity me, string txt) { if(me.text) strunzone(me.text); - setTextLabel(me, strzone(txt)); + SUPER(InputBox).setText(me, strzone(txt)); } void InputBox_Clear_Click(entity btn, entity me) @@ -303,7 +303,7 @@ void drawInputBox(entity me) } else draw_Text(me.realOrigin - eX * me.scrollPos, me.text, me.realFontSize, '1 1 1', 1, 0); - // skipping drawLabel(me); + // skipping SUPER(InputBox).draw(me); if(!me.focused || (time - me.lastChangeTime) < floor(time - me.lastChangeTime) + 0.5) draw_Text(me.realOrigin + eX * (cursorPosInWidths - me.scrollPos), CURSOR, me.realFontSize, '1 1 1', 1, 0); diff --git a/qcsrc/menu/item/inputcontainer.c b/qcsrc/menu/item/inputcontainer.c index 91e0012c8..8582202a7 100644 --- a/qcsrc/menu/item/inputcontainer.c +++ b/qcsrc/menu/item/inputcontainer.c @@ -17,7 +17,7 @@ ENDCLASS(InputContainer) #ifdef IMPLEMENTATION void resizeNotifyInputContainer(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { - resizeNotifyContainer(me, relOrigin, relSize, absOrigin, absSize); + SUPER(InputContainer).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); /* if(me.parent.instanceOfInputContainer) me.isTabRoot = 0; @@ -28,14 +28,14 @@ void resizeNotifyInputContainer(entity me, vector relOrigin, vector relSize, vec void focusLeaveInputContainer(entity me) { - focusLeaveContainer(me); + SUPER(InputContainer).focusLeave(me); me.mouseFocusedChild = NULL; } float keyDownInputContainer(entity me, float scan, float ascii, float shift) { entity f, ff; - if(keyDownContainer(me, scan, ascii, shift)) + if(SUPER(InputContainer).keyDown(me, scan, ascii, shift)) return 1; if(scan == K_ESCAPE) { @@ -126,7 +126,7 @@ float _changeFocusXYInputContainer(entity me, vector pos) float mouseDragInputContainer(entity me, vector pos) { - if(mouseDragContainer(me, pos)) + if(SUPER(InputContainer).mouseDrag(me, pos)) return 1; if(pos_x >= 0 && pos_y >= 0 && pos_x < 1 && pos_y < 1) return 1; @@ -135,7 +135,7 @@ float mouseDragInputContainer(entity me, vector pos) float mouseMoveInputContainer(entity me, vector pos) { if(me._changeFocusXY(me, pos)) - if(mouseMoveContainer(me, pos)) + if(SUPER(InputContainer).mouseMove(me, pos)) return 1; if(pos_x >= 0 && pos_y >= 0 && pos_x < 1 && pos_y < 1) return 1; @@ -145,7 +145,7 @@ float mousePressInputContainer(entity me, vector pos) { me.mouseFocusedChild = NULL; // force focusing if(me._changeFocusXY(me, pos)) - if(mousePressContainer(me, pos)) + if(SUPER(InputContainer).mousePress(me, pos)) return 1; if(pos_x >= 0 && pos_y >= 0 && pos_x < 1 && pos_y < 1) return 1; @@ -154,7 +154,7 @@ float mousePressInputContainer(entity me, vector pos) float mouseReleaseInputContainer(entity me, vector pos) { float r; - r = mouseReleaseContainer(me, pos); + r = SUPER(InputContainer).mouseRelease(me, pos); if(me.focused) // am I still eligible for this? (UGLY HACK, but a mouse event could have changed focus away) if(me._changeFocusXY(me, pos)) return 1; diff --git a/qcsrc/menu/item/label.c b/qcsrc/menu/item/label.c index 1ac50be75..279b92ac5 100644 --- a/qcsrc/menu/item/label.c +++ b/qcsrc/menu/item/label.c @@ -37,7 +37,7 @@ void setTextLabel(entity me, string txt) } void resizeNotifyLabel(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { - resizeNotifyItem(me, relOrigin, relSize, absOrigin, absSize); + SUPER(Label).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); // absSize_y is height of label me.realFontSize_y = me.fontSize / absSize_y; me.realFontSize_x = me.fontSize / absSize_x; diff --git a/qcsrc/menu/item/listbox.c b/qcsrc/menu/item/listbox.c index d85b1d528..8b572fc0a 100644 --- a/qcsrc/menu/item/listbox.c +++ b/qcsrc/menu/item/listbox.c @@ -47,7 +47,7 @@ void setSelectedListBox(entity me, float i) } void resizeNotifyListBox(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { - resizeNotifyItem(me, relOrigin, relSize, absOrigin, absSize); + SUPER(ListBox).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); me.controlWidth = me.scrollbarWidth / absSize_x; } void configureListBoxListBox(entity me, float theScrollbarWidth, float theItemHeight) diff --git a/qcsrc/menu/item/modalcontroller.c b/qcsrc/menu/item/modalcontroller.c index 9befdabbf..d47c2dcef 100644 --- a/qcsrc/menu/item/modalcontroller.c +++ b/qcsrc/menu/item/modalcontroller.c @@ -222,7 +222,7 @@ void drawModalController(entity me) me.setFocus(me, NULL); else me.setFocus(me, front); - drawContainer(me); + SUPER(ModalController).draw(me); }; void addTabModalController(entity me, entity other, entity tabButton) @@ -241,7 +241,7 @@ void addTabModalController(entity me, entity other, entity tabButton) void addItemModalController(entity me, entity other, vector theOrigin, vector theSize, float theAlpha) { - addItemContainer(me, other, theOrigin, theSize, (other == me.firstChild) ? theAlpha : 0); + SUPER(ModalController).addItem(me, other, theOrigin, theSize, (other == me.firstChild) ? theAlpha : 0); other.ModalController_initialSize = other.Container_size; other.ModalController_initialOrigin = other.Container_origin; other.ModalController_initialAlpha = theAlpha; // hope Container never modifies this diff --git a/qcsrc/menu/item/nexposee.c b/qcsrc/menu/item/nexposee.c index 75ebf3701..3c8efb0da 100644 --- a/qcsrc/menu/item/nexposee.c +++ b/qcsrc/menu/item/nexposee.c @@ -161,7 +161,7 @@ void drawNexposee(entity me) { me.animationFactor = 1; me.animationState = 2; - setFocusContainer(me, me.selectedChild); + SUPER(Nexposee).setFocus(me, me.selectedChild); } break; case 2: @@ -206,7 +206,7 @@ void drawNexposee(entity me) e.Container_fontscale = globalToBoxSize(e.Container_size, e.Nexposee_initialSize); } - drawContainer(me); + SUPER(Nexposee).draw(me); }; float mousePressNexposee(entity me, vector pos) @@ -218,7 +218,7 @@ float mousePressNexposee(entity me, vector pos) if(me.mouseFocusedChild) { me.animationState = 1; - setFocusContainer(me, NULL); + SUPER(Nexposee).setFocus(me, NULL); } else me.close(me); @@ -226,10 +226,10 @@ float mousePressNexposee(entity me, vector pos) } else if(me.animationState == 2) { - if not(mousePressContainer(me, pos)) + if not(SUPER(Nexposee).mousePress(me, pos)) { me.animationState = 3; - setFocusContainer(me, NULL); + SUPER(Nexposee).setFocus(me, NULL); } return 1; } @@ -239,14 +239,14 @@ float mousePressNexposee(entity me, vector pos) float mouseReleaseNexposee(entity me, vector pos) { if(me.animationState == 2) - return mouseReleaseContainer(me, pos); + return SUPER(Nexposee).mouseRelease(me, pos); return 0; } float mouseDragNexposee(entity me, vector pos) { if(me.animationState == 2) - return mouseDragContainer(me, pos); + return SUPER(Nexposee).mouseDrag(me, pos); return 0; } @@ -257,7 +257,7 @@ float mouseMoveNexposee(entity me, vector pos) e = me.mouseFocusedChild; me.mouseFocusedChild = me.itemFromPoint(me, pos); if(me.animationState == 2) - return mouseMoveContainer(me, pos); + return SUPER(Nexposee).mouseMove(me, pos); if(me.animationState == 0) { if(me.mouseFocusedChild) @@ -271,7 +271,7 @@ float mouseMoveNexposee(entity me, vector pos) float keyUpNexposee(entity me, float scan, float ascii, float shift) { if(me.animationState == 2) - return keyUpContainer(me, scan, ascii, shift); + return SUPER(Nexposee).keyUp(me, scan, ascii, shift); return 0; } @@ -279,7 +279,7 @@ float keyDownNexposee(entity me, float scan, float ascii, float shift) { float nexposeeKey; if(me.animationState == 2) - if(keyDownContainer(me, scan, ascii, shift)) + if(SUPER(Nexposee).keyDown(me, scan, ascii, shift)) return 1; if(scan == K_TAB) { @@ -329,7 +329,7 @@ float keyDownNexposee(entity me, float scan, float ascii, float shift) me.selectedChild = me.focusedChild; if not(me.selectedChild) me.animationState = 0; - setFocusContainer(me, NULL); + SUPER(Nexposee).setFocus(me, NULL); return 1; } return 0; @@ -337,7 +337,7 @@ float keyDownNexposee(entity me, float scan, float ascii, float shift) void addItemNexposee(entity me, entity other, vector theOrigin, vector theSize, float theAlpha) { - addItemContainer(me, other, theOrigin, theSize, theAlpha); + SUPER(Nexposee).addItem(me, other, theOrigin, theSize, theAlpha); other.Nexposee_initialSize = other.Container_size; other.Nexposee_initialOrigin = other.Container_origin; other.Nexposee_initialAlpha = other.Container_alpha; @@ -346,7 +346,7 @@ void addItemNexposee(entity me, entity other, vector theOrigin, vector theSize, void focusEnterNexposee(entity me) { if(me.animationState == 2) - setFocusContainer(me, me.selectedChild); + SUPER(Nexposee).setFocus(me, me.selectedChild); } void pullNexposeeNexposee(entity me, entity other, vector theAlign) diff --git a/qcsrc/menu/item/slider.c b/qcsrc/menu/item/slider.c index eeac0edd8..26c240f9f 100644 --- a/qcsrc/menu/item/slider.c +++ b/qcsrc/menu/item/slider.c @@ -65,7 +65,7 @@ string toStringSlider(entity me) } void resizeNotifySlider(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { - resizeNotifyLabel(me, relOrigin, relSize, absOrigin, absSize); + SUPER(Slider).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); me.controlWidth = absSize_y / absSize_x; } string valueToTextSlider(entity me, float val) @@ -76,7 +76,7 @@ string valueToTextSlider(entity me, float val) } void configureSliderVisualsSlider(entity me, float sz, float theAlign, float theTextSpace, string gfx) { - configureLabelLabel(me, string_null, sz, theAlign); + SUPER(Slider).configureLabel(me, string_null, sz, theAlign); me.textSpace = theTextSpace; me.keepspaceLeft = (theTextSpace == 0) ? 0 : (1 - theTextSpace); me.src = gfx; @@ -273,7 +273,7 @@ void drawSlider(entity me) } me.setText(me, me.valueToText(me, me.value)); draw_alpha = save; - drawLabel(me); + SUPER(Slider).draw(me); me.text = string_null; // TEMPSTRING! } #endif diff --git a/qcsrc/menu/item/textslider.c b/qcsrc/menu/item/textslider.c index b6a345481..d0899fb4a 100644 --- a/qcsrc/menu/item/textslider.c +++ b/qcsrc/menu/item/textslider.c @@ -37,10 +37,10 @@ void setValueFromIdentifierTextSlider(entity me, string id) for(i = 0; i < me.nValues; ++i) if(me.valueToIdentifier(me, i) == id) { - setValueSlider( me, i ); + SUPER(TextSlider).setValue( me, i ); return; } - setValueSlider( me, -1 ); + SUPER(TextSlider).setValue( me, -1 ); } string getIdentifierTextSlider(entity me) { diff --git a/qcsrc/menu/xonotic/campaign.c b/qcsrc/menu/xonotic/campaign.c index 1550d3f6f..a3b5927f2 100644 --- a/qcsrc/menu/xonotic/campaign.c +++ b/qcsrc/menu/xonotic/campaign.c @@ -207,13 +207,13 @@ void drawXonoticCampaignList(entity me) { if(cvar(me.cvarName) != me.campaignIndex || cvar_string("g_campaign_name") != campaign_name) me.loadCvars(me); - drawListBox(me); + SUPER(XonoticCampaignList).draw(me); } void resizeNotifyXonoticCampaignList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { me.itemAbsSize = '0 0 0'; - resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize); + SUPER(XonoticCampaignList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize_y * me.itemHeight)); me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth))); @@ -310,7 +310,7 @@ void CampaignList_LoadMap(entity btn, entity me) void setSelectedXonoticCampaignList(entity me, float i) { // prevent too late items from being played - setSelectedListBox(me, min(i, me.campaignIndex)); + SUPER(XonoticCampaignList).setSelected(me, min(i, me.campaignIndex)); } float keyDownXonoticCampaignList(entity me, float scan, float ascii, float shift) @@ -318,7 +318,7 @@ float keyDownXonoticCampaignList(entity me, float scan, float ascii, float shift if(scan == K_ENTER || scan == K_SPACE) CampaignList_LoadMap(me, me); else - return keyDownListBox(me, scan, ascii, shift); + return SUPER(XonoticCampaignList).keyDown(me, scan, ascii, shift); return 1; } #endif diff --git a/qcsrc/menu/xonotic/charmap.c b/qcsrc/menu/xonotic/charmap.c index 554740325..3f3f8e4e1 100644 --- a/qcsrc/menu/xonotic/charmap.c +++ b/qcsrc/menu/xonotic/charmap.c @@ -139,6 +139,6 @@ void drawXonoticCharmap(entity me) draw_Picture(c, me.image2, '0.0625 0.1 0', '1 1 1', 1); } } - drawImage(me); + SUPER(XonoticCharmap).draw(me); } #endif diff --git a/qcsrc/menu/xonotic/checkbox_slider_invalid.c b/qcsrc/menu/xonotic/checkbox_slider_invalid.c index ea05c3fd0..62d31fcc8 100644 --- a/qcsrc/menu/xonotic/checkbox_slider_invalid.c +++ b/qcsrc/menu/xonotic/checkbox_slider_invalid.c @@ -48,7 +48,7 @@ void drawXonoticSliderCheckBox(entity me) me.checked = ((me.controlledSlider.value == me.offValue) != me.inverted); if(me.controlledSlider.value == median(me.controlledSlider.valueMin, me.controlledSlider.value, me.controlledSlider.valueMax)) me.savedValue = me.controlledSlider.value; - drawCheckBox(me); + SUPER(XonoticSliderCheckBox).draw(me); } void setCheckedXonoticSliderCheckBox(entity me, float val) { diff --git a/qcsrc/menu/xonotic/colorbutton.c b/qcsrc/menu/xonotic/colorbutton.c index 84281b6af..2c30d88a1 100644 --- a/qcsrc/menu/xonotic/colorbutton.c +++ b/qcsrc/menu/xonotic/colorbutton.c @@ -71,6 +71,6 @@ void saveCvarsXonoticColorButton(entity me) void drawXonoticColorButton(entity me) { me.color2 = colormapPaletteColor(me.cvarValueFloat, me.cvarPart); - drawCheckBox(me); + SUPER(XonoticColorButton).draw(me); } #endif diff --git a/qcsrc/menu/xonotic/colorpicker.c b/qcsrc/menu/xonotic/colorpicker.c index a8403aee9..95fcf7fce 100644 --- a/qcsrc/menu/xonotic/colorpicker.c +++ b/qcsrc/menu/xonotic/colorpicker.c @@ -113,7 +113,7 @@ float keyDownXonoticColorpicker(entity me, float key, float ascii, float shift) } void drawXonoticColorpicker(entity me) { - drawImage(me); + SUPER(XonoticColorpicker).draw(me); float B, C, aC; C = cvar("r_textcontrast"); diff --git a/qcsrc/menu/xonotic/credits.c b/qcsrc/menu/xonotic/credits.c index 9beb213c2..816ba1c48 100644 --- a/qcsrc/menu/xonotic/credits.c +++ b/qcsrc/menu/xonotic/credits.c @@ -47,11 +47,11 @@ void drawXonoticCreditsList(entity me) i = max(i, ceil(me.scrollPos / me.itemHeight)); me.setSelected(me, i); } - drawListBox(me); + SUPER(XonoticCreditsList).draw(me); } void resizeNotifyXonoticCreditsList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { - resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize); + SUPER(XonoticCreditsList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); me.realFontSize_y = me.fontSize / (absSize_y * me.itemHeight); me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth)); @@ -102,7 +102,7 @@ float keyDownXonoticCreditsList(entity me, float scan, float ascii, float shift) else if(scan == K_DOWNARROW) me.scrollPos = min(me.scrollPos + me.itemHeight, me.nItems * me.itemHeight - 1); else - return keyDownListBox(me, scan, ascii, shift); + return SUPER(XonoticCreditsList).keyDown(me, scan, ascii, shift); i = min(me.selectedItem, floor((me.scrollPos + 1) / me.itemHeight - 1)); i = max(i, ceil(me.scrollPos / me.itemHeight)); diff --git a/qcsrc/menu/xonotic/crosshairbutton.c b/qcsrc/menu/xonotic/crosshairbutton.c index 209677ff5..a36a5a28f 100644 --- a/qcsrc/menu/xonotic/crosshairbutton.c +++ b/qcsrc/menu/xonotic/crosshairbutton.c @@ -72,7 +72,7 @@ void drawXonoticCrosshairButton(entity me) rgb = '1 1 1'; } - drawCheckBox(me); + SUPER(XonoticCrosshairButton).draw(me); sz = draw_PictureSize(me.src3); sz = globalToBoxSize(sz, draw_scale); diff --git a/qcsrc/menu/xonotic/cvarlist.c b/qcsrc/menu/xonotic/cvarlist.c index cf3cd940f..ca6b1b2b4 100644 --- a/qcsrc/menu/xonotic/cvarlist.c +++ b/qcsrc/menu/xonotic/cvarlist.c @@ -59,7 +59,7 @@ void setSelectedXonoticCvarList(entity me, float i) { string s; - setSelectedListBox(me, i); + SUPER(XonoticCvarList).setSelected(me, i); if(me.nItems == 0) return; @@ -109,7 +109,7 @@ void CvarList_Filter_Change(entity box, entity me) } void resizeNotifyXonoticCvarList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { - resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize); + SUPER(XonoticCvarList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); me.realFontSize_y = me.fontSize / (absSize_y * me.itemHeight); me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth)); @@ -157,7 +157,7 @@ void drawListBoxItemXonoticCvarList(entity me, float i, vector absSize, float is float keyDownXonoticCvarList(entity me, float scan, float ascii, float shift) { - if(keyDownListBox(me, scan, ascii, shift)) + if(SUPER(XonoticCvarList).keyDown(me, scan, ascii, shift)) return 1; else if(!me.controlledTextbox) return 0; diff --git a/qcsrc/menu/xonotic/demolist.c b/qcsrc/menu/xonotic/demolist.c index 7a2d338ea..15498743d 100644 --- a/qcsrc/menu/xonotic/demolist.c +++ b/qcsrc/menu/xonotic/demolist.c @@ -82,7 +82,7 @@ void destroyXonoticDemoList(entity me) void resizeNotifyXonoticDemoList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { me.itemAbsSize = '0 0 0'; - resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize); + SUPER(XonoticDemoList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize_y * me.itemHeight)); me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth))); @@ -160,7 +160,7 @@ float keyDownXonoticDemoList(entity me, float scan, float ascii, float shift) return 1; } else - return keyDownListBox(me, scan, ascii, shift); + return SUPER(XonoticDemoList).keyDown(me, scan, ascii, shift); } #endif diff --git a/qcsrc/menu/xonotic/dialog.c b/qcsrc/menu/xonotic/dialog.c index badfbaf44..b8cfac55b 100644 --- a/qcsrc/menu/xonotic/dialog.c +++ b/qcsrc/menu/xonotic/dialog.c @@ -36,7 +36,7 @@ entity currentDialog; void configureDialogXonoticDialog(entity me) { currentDialog = me; - configureDialogDialog(me); + SUPER(XonoticDialog).configureDialog(me); me.tooltip = getZonedTooltipForIdentifier(me.classname); } #endif diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c index 160f15d26..84cc7fddd 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c @@ -73,6 +73,6 @@ void closeXonoticAdvancedDialog(entity me) { if(me.refilterEntity) me.refilterEntity.refilter(me.refilterEntity); - closeDialog(me); + SUPER(XonoticAdvancedDialog).close(me); } #endif diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c index 12d7e4fcc..f49cccd1b 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c @@ -280,6 +280,6 @@ void closeXonoticMutatorsDialog(entity me) { if(me.refilterEntity) me.refilterEntity.refilter(me.refilterEntity); - closeDialog(me); + SUPER(XonoticMutatorsDialog).close(me); } #endif diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c index f3d3fbf75..1b48b1564 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c @@ -26,7 +26,7 @@ void drawXonoticPlayerSettingsTab(entity me) me.playerNameLabel.alpha = ((mod(time * 2, 2) < 1) ? 1 : 0); else me.playerNameLabel.alpha = me.playerNameLabelAlpha; - drawContainer(me); + SUPER(XonoticPlayerSettingsTab).draw(me); } void fillXonoticPlayerSettingsTab(entity me) { diff --git a/qcsrc/menu/xonotic/inputbox.c b/qcsrc/menu/xonotic/inputbox.c index 0793ae181..c585e0548 100644 --- a/qcsrc/menu/xonotic/inputbox.c +++ b/qcsrc/menu/xonotic/inputbox.c @@ -52,17 +52,17 @@ void setTextXonoticInputBox(entity me, string new) { if(me.text != new) { - setTextInputBox(me, new); + SUPER(XonoticInputBox).setText(me, new); me.onChange(me, me.onChangeEntity); } else - setTextInputBox(me, new); + SUPER(XonoticInputBox).setText(me, new); } void loadCvarsXonoticInputBox(entity me) { if not(me.cvarName) return; - setTextInputBox(me, cvar_string(me.cvarName)); + SUPER(XonoticInputBox).setText(me, cvar_string(me.cvarName)); } void saveCvarsXonoticInputBox(entity me) { @@ -83,7 +83,7 @@ float keyDownXonoticInputBox(entity me, float key, float ascii, float shift) } me.onEnter(me, me.onEnterEntity); } - if(keyDownInputBox(me, key, ascii, shift)) + if(SUPER(XonoticInputBox).keyDown(me, key, ascii, shift)) r = 1; return r; } diff --git a/qcsrc/menu/xonotic/keybinder.c b/qcsrc/menu/xonotic/keybinder.c index 6b490be23..c2d124c04 100644 --- a/qcsrc/menu/xonotic/keybinder.c +++ b/qcsrc/menu/xonotic/keybinder.c @@ -78,7 +78,7 @@ void configureXonoticKeyBinderXonoticKeyBinder(entity me) } void resizeNotifyXonoticKeyBinder(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { - resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize); + SUPER(XonoticKeyBinder).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); me.realFontSize_y = me.fontSize / (absSize_y * me.itemHeight); me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth)); @@ -231,7 +231,7 @@ void setSelectedXonoticKeyBinder(entity me, float i) me.previouslySelected = i; if(me.userbindEditButton) me.userbindEditButton.disabled = (substring(Xonotic_KeyBinds_Descriptions[i], 0, 1) != "$"); - setSelectedListBox(me, i); + SUPER(XonoticKeyBinder).setSelected(me, i); } float keyDownXonoticKeyBinder(entity me, float key, float ascii, float shift) { @@ -248,7 +248,7 @@ float keyDownXonoticKeyBinder(entity me, float key, float ascii, float shift) KeyBinder_Bind_Clear(me, me); break; default: - r = keyDownListBox(me, key, ascii, shift); + r = SUPER(XonoticKeyBinder).keyDown(me, key, ascii, shift); break; } return r; diff --git a/qcsrc/menu/xonotic/listbox.c b/qcsrc/menu/xonotic/listbox.c index ce08d4bf4..f0df7216d 100644 --- a/qcsrc/menu/xonotic/listbox.c +++ b/qcsrc/menu/xonotic/listbox.c @@ -32,6 +32,6 @@ void configureXonoticListBoxXonoticListBox(entity me) void resizeNotifyXonoticListBox(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { me.itemHeight = me.rowsPerItem * me.fontSize / absSize_y; - resizeNotifyListBox(me, relOrigin, relSize, absOrigin, absSize); + SUPER(XonoticListBox).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); } #endif diff --git a/qcsrc/menu/xonotic/maplist.c b/qcsrc/menu/xonotic/maplist.c index 9bce96dfd..88be81679 100644 --- a/qcsrc/menu/xonotic/maplist.c +++ b/qcsrc/menu/xonotic/maplist.c @@ -117,13 +117,13 @@ void drawXonoticMapList(entity me) { if(me.startButton) me.startButton.disabled = ((me.selectedItem < 0) || (me.selectedItem >= me.nItems)); - drawListBox(me); + SUPER(XonoticMapList).draw(me); } void resizeNotifyXonoticMapList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { me.itemAbsSize = '0 0 0'; - resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize); + SUPER(XonoticMapList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize_y * me.itemHeight)); me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth))); @@ -348,7 +348,7 @@ float keyDownXonoticMapList(entity me, float scan, float ascii, float shift) me.setSelected(me, MapInfo_FindName_firstResult); } else - return keyDownListBox(me, scan, ascii, shift); + return SUPER(XonoticMapList).keyDown(me, scan, ascii, shift); return 1; } diff --git a/qcsrc/menu/xonotic/playerlist.c b/qcsrc/menu/xonotic/playerlist.c index 4406e5805..e616c4fa6 100644 --- a/qcsrc/menu/xonotic/playerlist.c +++ b/qcsrc/menu/xonotic/playerlist.c @@ -79,7 +79,7 @@ string getPlayerListXonoticPlayerList(entity me, float i, float key) void resizeNotifyXonoticPlayerList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { me.itemAbsSize = '0 0 0'; - resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize); + SUPER(XonoticPlayerList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize_y * me.itemHeight)); me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth))); diff --git a/qcsrc/menu/xonotic/playermodel.c b/qcsrc/menu/xonotic/playermodel.c index 27d5721af..6f4851c99 100644 --- a/qcsrc/menu/xonotic/playermodel.c +++ b/qcsrc/menu/xonotic/playermodel.c @@ -161,7 +161,7 @@ void drawXonoticPlayerModelSelector(entity me) float i, n; vector o; - drawImage(me); + SUPER(XonoticPlayerModelSelector).draw(me); // draw text on the image, handle \n in the description draw_CenterText('0.5 0 0', me.currentModelTitle, me.realFontSize * (me.titleFontSize / me.fontSize), SKINCOLOR_MODELTITLE, SKINALPHA_MODELTITLE, FALSE); @@ -176,7 +176,7 @@ void drawXonoticPlayerModelSelector(entity me) void resizeNotifyXonoticPlayerModelSelector(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { - resizeNotifyImage(me, relOrigin, relSize, absOrigin, absSize); + SUPER(XonoticPlayerModelSelector).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); me.realFontSize_y = me.fontSize / absSize_y; me.realFontSize_x = me.fontSize / absSize_x; } diff --git a/qcsrc/menu/xonotic/radiobutton.c b/qcsrc/menu/xonotic/radiobutton.c index 0281a542d..2591356a0 100644 --- a/qcsrc/menu/xonotic/radiobutton.c +++ b/qcsrc/menu/xonotic/radiobutton.c @@ -89,7 +89,7 @@ void drawXonoticRadioButton(entity me) if(!found) me.setChecked(me, 1); } - drawCheckBox(me); + SUPER(XonoticRadioButton).draw(me); } void saveCvarsXonoticRadioButton(entity me) { diff --git a/qcsrc/menu/xonotic/serverlist.c b/qcsrc/menu/xonotic/serverlist.c index d4b01e282..860bc739b 100644 --- a/qcsrc/menu/xonotic/serverlist.c +++ b/qcsrc/menu/xonotic/serverlist.c @@ -153,7 +153,7 @@ void setSelectedXonoticServerList(entity me, float i) { float save; save = me.selectedItem; - setSelectedListBox(me, i); + SUPER(XonoticServerList).setSelected(me, i); /* if(me.selectedItem == save) return; @@ -317,7 +317,7 @@ void drawXonoticServerList(entity me) me.ipAddressBoxFocused = me.ipAddressBox.focused; } - drawListBox(me); + SUPER(XonoticServerList).draw(me); } void ServerList_PingSort_Click(entity btn, entity me) { @@ -449,7 +449,7 @@ void positionSortButtonXonoticServerList(entity me, entity btn, float theOrigin, } void resizeNotifyXonoticServerList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { - resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize); + SUPER(XonoticServerList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); me.realFontSize_y = me.fontSize / (absSize_y * me.itemHeight); me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth)); @@ -601,7 +601,7 @@ float keyDownXonoticServerList(entity me, float scan, float ascii, float shift) me.ipAddressBoxFocused = -1; } } - else if(keyDownListBox(me, scan, ascii, shift)) + else if(SUPER(XonoticServerList).keyDown(me, scan, ascii, shift)) return 1; else if(!me.controlledTextbox) return 0; diff --git a/qcsrc/menu/xonotic/skinlist.c b/qcsrc/menu/xonotic/skinlist.c index 78ff80ca4..05820bf63 100644 --- a/qcsrc/menu/xonotic/skinlist.c +++ b/qcsrc/menu/xonotic/skinlist.c @@ -136,7 +136,7 @@ void destroyXonoticSkinList(entity me) void resizeNotifyXonoticSkinList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { me.itemAbsSize = '0 0 0'; - resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize); + SUPER(XonoticSkinList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize_y * me.itemHeight)); me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth))); @@ -200,6 +200,6 @@ float keyDownXonoticSkinList(entity me, float scan, float ascii, float shift) return 1; } else - return keyDownListBox(me, scan, ascii, shift); + return SUPER(XonoticSkinList).keyDown(me, scan, ascii, shift); } #endif diff --git a/qcsrc/menu/xonotic/slider.c b/qcsrc/menu/xonotic/slider.c index 134557da7..a2e22a553 100644 --- a/qcsrc/menu/xonotic/slider.c +++ b/qcsrc/menu/xonotic/slider.c @@ -53,7 +53,7 @@ void setValueXonoticSlider(entity me, float val) { if(val != me.value) { - setValueSlider( me, val ); + SUPER(XonoticSlider).setValue( me, val ); me.saveCvars(me); } } diff --git a/qcsrc/menu/xonotic/slider_decibels.c b/qcsrc/menu/xonotic/slider_decibels.c index ba7cffc22..8ba5a235f 100644 --- a/qcsrc/menu/xonotic/slider_decibels.c +++ b/qcsrc/menu/xonotic/slider_decibels.c @@ -50,7 +50,7 @@ string valueToTextXonoticDecibelsSlider(entity me, float v) return "OFF"; else if(v >= -0.1) return "MAX"; - return strcat(valueToTextSlider(me, v), " dB"); + return strcat(SUPER(XonoticDecibelsSlider).valueToText(me, v), " dB"); } #endif diff --git a/qcsrc/menu/xonotic/tab.c b/qcsrc/menu/xonotic/tab.c index d771d7157..42d952e96 100644 --- a/qcsrc/menu/xonotic/tab.c +++ b/qcsrc/menu/xonotic/tab.c @@ -25,6 +25,6 @@ ENDCLASS(XonoticTab) void showNotifyXonoticTab(entity me) { loadAllCvars(me); - showNotifyContainer(me); + SUPER(XonoticTab).showNotify(me); } #endif diff --git a/qcsrc/menu/xonotic/textlabel.c b/qcsrc/menu/xonotic/textlabel.c index 020f79035..d0107525f 100644 --- a/qcsrc/menu/xonotic/textlabel.c +++ b/qcsrc/menu/xonotic/textlabel.c @@ -23,6 +23,6 @@ void configureXonoticTextLabelXonoticTextLabel(entity me, float theAlign, string } void drawXonoticTextLabel(entity me) { - drawLabel(me); + SUPER(XonoticTextLabel).draw(me); } #endif diff --git a/qcsrc/menu/xonotic/textslider.c b/qcsrc/menu/xonotic/textslider.c index 2236bc51f..0c0da18aa 100644 --- a/qcsrc/menu/xonotic/textslider.c +++ b/qcsrc/menu/xonotic/textslider.c @@ -46,7 +46,7 @@ void setValueXonoticTextSlider(entity me, float val) { if(val != me.value) { - setValueSlider( me, val ); + SUPER(XonoticTextSlider).setValue( me, val ); me.saveCvars(me); } } diff --git a/qcsrc/menu/xonotic/weaponslist.c b/qcsrc/menu/xonotic/weaponslist.c index 012f7bc7e..d800005e3 100644 --- a/qcsrc/menu/xonotic/weaponslist.c +++ b/qcsrc/menu/xonotic/weaponslist.c @@ -41,7 +41,7 @@ void drawXonoticWeaponsList(entity me) cvar_set("cl_weaponpriority", W_NameWeaponOrder(t)); } me.nItems = tokenize_console(t); - drawListBox(me); + SUPER(XonoticWeaponsList).draw(me); } void WeaponsList_MoveUp_Click(entity box, entity me) { @@ -61,7 +61,7 @@ void WeaponsList_MoveDown_Click(entity box, entity me) } void resizeNotifyXonoticWeaponsList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { - resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize); + SUPER(XonoticWeaponsList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); me.realFontSize_y = me.fontSize / (absSize_y * me.itemHeight); me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth)); @@ -71,7 +71,7 @@ float mouseDragXonoticWeaponsList(entity me, vector pos) { float f, i; i = me.selectedItem; - f = mouseDragListBox(me, pos); + f = SUPER(XonoticWeaponsList).mouseDrag(me, pos); if(me.selectedItem != i) cvar_set("cl_weaponpriority", swapInPriorityList(cvar_string("cl_weaponpriority"), me.selectedItem, i)); return f; @@ -111,7 +111,7 @@ float keyDownXonoticWeaponsList(entity me, float scan, float ascii, float shift) WeaponsList_MoveDown_Click(NULL, me); return 1; } - else if(keyDownListBox(me, scan, ascii, shift)) + else if(SUPER(XonoticWeaponsList).keyDown(me, scan, ascii, shift)) return 1; return 0; } -- 2.39.2