let's USE the super keyword! yay!

diff --git a/qcsrc/menu/item/borderimage.c b/qcsrc/menu/item/borderimage.c
index 1bb458ad1d1d365b4591d5eaeb372583bd12d5e3..7083f652786ce7bf0df64db2aecf5c6376f6cb99 100644 (file)
--- 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;
        {
                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;
        }
                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)
        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);
                }
 
                        draw_fontscale = globalToBoxSize(boxToGlobalSize(df, me.realFontSize), rf);
                }
 

-               drawLabel(me);
+               SUPER(BorderImage).draw(me);

 
                if(me.isNexposeeTitleBar)
                {
 
                if(me.isNexposeeTitleBar)
                {

diff --git a/qcsrc/menu/item/button.c b/qcsrc/menu/item/button.c
index 096c75b805388d5bb81f21d03b8c9b4372ff8ff2..b63928fd46919d1e82011598c7ecad23b45428ac 100644 (file)
--- 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);
                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)
 {
 }
 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)
        me.src = gfx;
 }
 float keyDownButton(entity me, float key, float ascii, float shift)


@@ -150,7 +150,7 @@ void drawButton(entity me)
 
        draw_alpha = save;
 
 
        draw_alpha = save;
 

-       drawLabel(me);
+       SUPER(Button).draw(me);

 
        if(me.clickTime > 0 && me.clickTime <= frametime)
        {
 
        if(me.clickTime > 0 && me.clickTime <= frametime)
        {

diff --git a/qcsrc/menu/item/checkbox.c b/qcsrc/menu/item/checkbox.c
index 40fa6675bd0df2ba8d1e92b51c8a4233bfa3d38a..adbedf95a5ca242149aa4d6474e48e16e5f5c38d 100644 (file)
--- 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)
 {
 }
 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)
 {
 }
 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");
        }
        else
                me.srcSuffix = (me.checked ? "1" : "0");

-       drawButton(me);
+       SUPER(CheckBox).draw(me);

        me.pressed = s;
 }
 #endif
        me.pressed = s;
 }
 #endif

diff --git a/qcsrc/menu/item/container.c b/qcsrc/menu/item/container.c
index 53e3eaa1acc57bdf1c787d21bf6801971bccf37a..0984b3718dd53b12f732e9fbbba31163ba4c22b7 100644 (file)
--- 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);
                        }
        }
        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)
 }
 
 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 7733a60302e59c3cfea156a7b7e393bcb9082f5f..20651f87fcbf09967b1e98278072e86e32878616 100644 (file)
--- 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 1;
                }
        }

-       return keyDownInputContainer(me, key, ascii, shift);
+       return SUPER(Dialog).keyDown(me, key, ascii, shift);

 }
 #endif
 }
 #endif

diff --git a/qcsrc/menu/item/gecko.c b/qcsrc/menu/item/gecko.c
index 10e0c2feed58f3097781597b6c5b82125ab951d9..5f309126365568c529f172e5c3d4ab8f2eeebbf5 100644 (file)
--- 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)
 {
 
 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 );
 }
        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 c60ec232f2c7b2f2e4e5539f02bb69a034711464..e44f39efbbe3660113e8702e1cd158d710e80400 100644 (file)
--- 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)
 {
 }
 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
        me.updateAspect(me);
 }
 #endif

diff --git a/qcsrc/menu/item/inputbox.c b/qcsrc/menu/item/inputbox.c
index 03e1605daff2411d2a426874be3c823355024972..e34e5ff5296d8007a928709c4e43d79984578f25 100644 (file)
--- 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)
 {
 #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;
 }
        me.src = gfx;
        me.cursorPos = theCursorPos;
 }


@@ -42,7 +42,7 @@ void setTextInputBox(entity me, string txt)
 {
        if(me.text)
                strunzone(me.text);
 {
        if(me.text)
                strunzone(me.text);

-       setTextLabel(me, strzone(txt));
+       SUPER(InputBox).setText(me, strzone(txt));

 }
 
 void InputBox_Clear_Click(entity btn, entity me)
 }
 
 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);
        }
        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);
 
        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 91e0012c888bd445fabe771d1ef4a81cb6e8c0ca..8582202a7d83df1b057066b8a49fed71771367a8 100644 (file)
--- 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)
 {
 #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;
        /*
        if(me.parent.instanceOfInputContainer)
                me.isTabRoot = 0;


@@ -28,14 +28,14 @@ void resizeNotifyInputContainer(entity me, vector relOrigin, vector relSize, vec
 
 void focusLeaveInputContainer(entity me)
 {
 
 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;
        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)
        {
                return 1;
        if(scan == K_ESCAPE)
        {


@@ -126,7 +126,7 @@ float _changeFocusXYInputContainer(entity me, vector pos)
 
 float mouseDragInputContainer(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;
                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))
 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;
                        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))
 {
        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;
                        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;
 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;
        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 1ac50be751e0d3853fd07f9b26b826edea4c4b83..279b92ac57b6f5a60200f2e4cc0199b18e6115ed 100644 (file)
--- 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)
 {
 }
 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;
        // 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 d85b1d5285084566dae9598a08565312cd45bfd0..8b572fc0a2a56011b04fb7c05d53c2be7d68701b 100644 (file)
--- 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)
 {
 }
 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)
        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 9befdabbfbd3976803c4b21600e5d5efa2045981..d47c2dcef7d215f0d99e68465bee8f93df5f0def 100644 (file)
--- 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);
                me.setFocus(me, NULL);
        else
                me.setFocus(me, front);

-       drawContainer(me);
+       SUPER(ModalController).draw(me);

 };
 
 void addTabModalController(entity me, entity other, entity tabButton)
 };
 
 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)
 {
 
 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
        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 75ebf3701cdddb8ec97bba74ece080a11e61d402..3c8efb0daefc34d48817adbdb6a7be24b09557b9 100644 (file)
--- 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;
                        {
                                me.animationFactor = 1;
                                me.animationState = 2;

-                               setFocusContainer(me, me.selectedChild);
+                               SUPER(Nexposee).setFocus(me, me.selectedChild);

                        }
                        break;
                case 2:
                        }
                        break;
                case 2:


@@ -206,7 +206,7 @@ void drawNexposee(entity me)
                e.Container_fontscale = globalToBoxSize(e.Container_size, e.Nexposee_initialSize);
        }
 
                e.Container_fontscale = globalToBoxSize(e.Container_size, e.Nexposee_initialSize);
        }
 

-       drawContainer(me);
+       SUPER(Nexposee).draw(me);

 };
 
 float mousePressNexposee(entity me, vector pos)
 };
 
 float mousePressNexposee(entity me, vector pos)


@@ -218,7 +218,7 @@ float mousePressNexposee(entity me, vector pos)
                if(me.mouseFocusedChild)
                {
                        me.animationState = 1;
                if(me.mouseFocusedChild)
                {
                        me.animationState = 1;

-                       setFocusContainer(me, NULL);
+                       SUPER(Nexposee).setFocus(me, NULL);

                }
                else
                        me.close(me);
                }
                else
                        me.close(me);


@@ -226,10 +226,10 @@ float mousePressNexposee(entity me, vector pos)
        }
        else if(me.animationState == 2)
        {
        }
        else if(me.animationState == 2)
        {

-               if not(mousePressContainer(me, pos))
+               if not(SUPER(Nexposee).mousePress(me, pos))

                {
                        me.animationState = 3;
                {
                        me.animationState = 3;

-                       setFocusContainer(me, NULL);
+                       SUPER(Nexposee).setFocus(me, NULL);

                }
                return 1;
        }
                }
                return 1;
        }


@@ -239,14 +239,14 @@ float mousePressNexposee(entity me, vector pos)
 float mouseReleaseNexposee(entity me, vector pos)
 {
        if(me.animationState == 2)
 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 0;
 }
 
 float mouseDragNexposee(entity me, vector pos)
 {
        if(me.animationState == 2)

-               return mouseDragContainer(me, pos);
+               return SUPER(Nexposee).mouseDrag(me, pos);

        return 0;
 }
 
        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)
        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)
        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)
 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;
 }
 
        return 0;
 }
 


@@ -279,7 +279,7 @@ float keyDownNexposee(entity me, float scan, float ascii, float shift)
 {
        float nexposeeKey;
        if(me.animationState == 2)
 {
        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)
        {
                        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;
                        me.selectedChild = me.focusedChild;
                if not(me.selectedChild)
                        me.animationState = 0;

-               setFocusContainer(me, NULL);
+               SUPER(Nexposee).setFocus(me, NULL);

                return 1;
        }
        return 0;
                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)
 {
 
 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;
        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)
 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)
 }
 
 void pullNexposeeNexposee(entity me, entity other, vector theAlign)

diff --git a/qcsrc/menu/item/slider.c b/qcsrc/menu/item/slider.c
index eeac0edd844ba43d3e1e25ae197cd2188eda9bd6..26c240f9f48eeff784d1725c5b5ed1531f340e86 100644 (file)
--- 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)
 {
 }
 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)
        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)
 {
 }
 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;
        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;
        }
        me.setText(me, me.valueToText(me, me.value));
        draw_alpha = save;

-       drawLabel(me);
+       SUPER(Slider).draw(me);

        me.text = string_null; // TEMPSTRING!
 }
 #endif
        me.text = string_null; // TEMPSTRING!
 }
 #endif

diff --git a/qcsrc/menu/item/textslider.c b/qcsrc/menu/item/textslider.c
index b6a345481171b949904913e5010a6c57ac24bc08..d0899fb4a00bc25f4da218f8eeb7b8a613c9f0b3 100644 (file)
--- 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)
                {
        for(i = 0; i < me.nValues; ++i)
                if(me.valueToIdentifier(me, i) == id)
                {

-                       setValueSlider( me, i );
+                       SUPER(TextSlider).setValue( me, i );

                        return;
                }
                        return;
                }

-       setValueSlider( me, -1 );
+       SUPER(TextSlider).setValue( me, -1 );

 }
 string getIdentifierTextSlider(entity me)
 {
 }
 string getIdentifierTextSlider(entity me)
 {

diff --git a/qcsrc/menu/xonotic/campaign.c b/qcsrc/menu/xonotic/campaign.c
index 1550d3f6fc7e93df6cb637111fe3ca9312aff846..a3b5927f287f8282b9beedefc48afaa2a0f2095e 100644 (file)
--- 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);
 {
        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';
 }
 
 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)));
 
        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
 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)
 }
 
 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
        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
        return 1;
 }
 #endif

diff --git a/qcsrc/menu/xonotic/charmap.c b/qcsrc/menu/xonotic/charmap.c
index 5547403251dcff62c388c446e9bb0082207e3178..3f3f8e4e1db18557f4ca53422a3b847a5ea59eec 100644 (file)
--- 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);
                }
        }
                        draw_Picture(c, me.image2, '0.0625 0.1 0', '1 1 1', 1);
                }
        }

-       drawImage(me);
+       SUPER(XonoticCharmap).draw(me);

 }
 #endif
 }
 #endif

diff --git a/qcsrc/menu/xonotic/checkbox_slider_invalid.c b/qcsrc/menu/xonotic/checkbox_slider_invalid.c
index ea05c3fd067dd63699246b247c1a92f8aa27aaea..62d31fcc8c98d8b1626308c63f0ffd1cbe0f0e36 100644 (file)
--- 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;
        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)
 {
 }
 void setCheckedXonoticSliderCheckBox(entity me, float val)
 {

diff --git a/qcsrc/menu/xonotic/colorbutton.c b/qcsrc/menu/xonotic/colorbutton.c
index 84281b6af3229de04ecf39d696aa3961255fffb6..2c30d88a1eaaf0368a2990ba445d7fd8db6326ea 100644 (file)
--- 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);
 void drawXonoticColorButton(entity me)
 {
        me.color2 = colormapPaletteColor(me.cvarValueFloat, me.cvarPart);

-       drawCheckBox(me);
+       SUPER(XonoticColorButton).draw(me);

 }
 #endif
 }
 #endif

diff --git a/qcsrc/menu/xonotic/colorpicker.c b/qcsrc/menu/xonotic/colorpicker.c
index a8403aee955b79c5171fd1c7e8e1b000894eb92c..95fcf7fcee19f214b6016d64cf4a30575d9715c6 100644 (file)
--- 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)
 {
 }
 void drawXonoticColorpicker(entity me)
 {

-       drawImage(me);
+       SUPER(XonoticColorpicker).draw(me);

 
        float B, C, aC;
        C = cvar("r_textcontrast");
 
        float B, C, aC;
        C = cvar("r_textcontrast");

diff --git a/qcsrc/menu/xonotic/credits.c b/qcsrc/menu/xonotic/credits.c
index 9beb213c22c29df1989c29745ada4fb532b80183..816ba1c48889af322519528faa3dad88b73646f1 100644 (file)
--- 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);
        }
                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)
 {
 }
 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));
 
        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
        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));
 
        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 209677ff5df16248d727f7aa945b01053356e403..a36a5a28fcb956500ef5f43aaf05c6239089c237 100644 (file)
--- a/qcsrc/menu/xonotic/crosshairbutton.c
+++ b/qcsrc/menu/xonotic/crosshairbutton.c
@@ -72,7 +72,7 @@ void drawXonoticCrosshairButton(entity me)
                rgb = '1 1 1';
        }
 
                rgb = '1 1 1';
        }
 

-       drawCheckBox(me);
+       SUPER(XonoticCrosshairButton).draw(me);

 
        sz = draw_PictureSize(me.src3);
        sz = globalToBoxSize(sz, draw_scale);
 
        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 cf3cd940fa52d13c55d451cd82fdcf9eb1b01a63..ca6b1b2b42de1375889a8f15ff9eaeccf450ff67 100644 (file)
--- a/qcsrc/menu/xonotic/cvarlist.c
+++ b/qcsrc/menu/xonotic/cvarlist.c
@@ -59,7 +59,7 @@ void setSelectedXonoticCvarList(entity me, float i)
 {
        string s;
 
 {
        string s;
 

-       setSelectedListBox(me, i);
+       SUPER(XonoticCvarList).setSelected(me, i);

        if(me.nItems == 0)
                return;
        
        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)
 {
 }
 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));
 
        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)
 {
 
 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;
                return 1;
        else if(!me.controlledTextbox)
                return 0;

diff --git a/qcsrc/menu/xonotic/demolist.c b/qcsrc/menu/xonotic/demolist.c
index 7a2d338ea382efc88361ca91daa48bff07cf7112..15498743d5d2948b165c6a0b0e0b5d9b70f3933e 100644 (file)
--- 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';
 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)));
 
     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 1;
     }
     else

-        return keyDownListBox(me, scan, ascii, shift);
+        return SUPER(XonoticDemoList).keyDown(me, scan, ascii, shift);

 }
 #endif
 
 }
 #endif
 

diff --git a/qcsrc/menu/xonotic/dialog.c b/qcsrc/menu/xonotic/dialog.c
index badfbaf4449b1a015ee005b457f9b53928d020ab..b8cfac55b62b2f3b732b210a521507288044de10 100644 (file)
--- a/qcsrc/menu/xonotic/dialog.c
+++ b/qcsrc/menu/xonotic/dialog.c
@@ -36,7 +36,7 @@ entity currentDialog;
 void configureDialogXonoticDialog(entity me)
 {
        currentDialog = me;
 void configureDialogXonoticDialog(entity me)
 {
        currentDialog = me;

-       configureDialogDialog(me);
+       SUPER(XonoticDialog).configureDialog(me);

        me.tooltip = getZonedTooltipForIdentifier(me.classname);
 }
 #endif
        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 160f15d2658a36dbcc15eaeeda2eca051a951c56..84cc7fddddeb69727aa47960b68be6c9bbc1c064 100644 (file)
--- 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);
 {
        if(me.refilterEntity)
                me.refilterEntity.refilter(me.refilterEntity);

-       closeDialog(me);
+       SUPER(XonoticAdvancedDialog).close(me);

 }
 #endif
 }
 #endif

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
index 12d7e4fccb980ce15b539d6a80ae9662faa55bb1..f49cccd1ba355a7dfbdcf85b15acf9540c3d5f0a 100644 (file)
--- 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);
 {
        if(me.refilterEntity)
                me.refilterEntity.refilter(me.refilterEntity);

-       closeDialog(me);
+       SUPER(XonoticMutatorsDialog).close(me);

 }
 #endif
 }
 #endif

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index f3d3fbf758dd40dc3a7468c37a13fa1a1894da6a..1b48b15641ef31bb30938d9e76165509355a7c00 100644 (file)
--- 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;
                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)
 {
 }
 void fillXonoticPlayerSettingsTab(entity me)
 {

diff --git a/qcsrc/menu/xonotic/inputbox.c b/qcsrc/menu/xonotic/inputbox.c
index 0793ae181227fade01f859aa06b40c9c4ddfdb97..c585e0548672fe9d9f9d33476cd19d42183e7b50 100644 (file)
--- 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)
        {
 {
        if(me.text != new)
        {

-               setTextInputBox(me, new);
+               SUPER(XonoticInputBox).setText(me, new);

                me.onChange(me, me.onChangeEntity);
        }
        else
                me.onChange(me, me.onChangeEntity);
        }
        else

-               setTextInputBox(me, new);
+               SUPER(XonoticInputBox).setText(me, new);

 }
 void loadCvarsXonoticInputBox(entity me)
 {
        if not(me.cvarName)
                return;
 }
 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)
 {
 }
 void saveCvarsXonoticInputBox(entity me)
 {


@@ -83,7 +83,7 @@ float keyDownXonoticInputBox(entity me, float key, float ascii, float shift)
                }
                me.onEnter(me, me.onEnterEntity);
        }
                }
                me.onEnter(me, me.onEnterEntity);
        }

-       if(keyDownInputBox(me, key, ascii, shift))
+       if(SUPER(XonoticInputBox).keyDown(me, key, ascii, shift))

                r = 1;
        return r;
 }
                r = 1;
        return r;
 }

diff --git a/qcsrc/menu/xonotic/keybinder.c b/qcsrc/menu/xonotic/keybinder.c
index 6b490be23115a380ece36e67930e7551b0f73f32..c2d124c04113b34fabc35e42754fcfb2f8567a05 100644 (file)
--- 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)
 {
 }
 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));
 
        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) != "$");
                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)
 {
 }
 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:
                        KeyBinder_Bind_Clear(me, me);
                        break;
                default:

-                       r = keyDownListBox(me, key, ascii, shift);
+                       r = SUPER(XonoticKeyBinder).keyDown(me, key, ascii, shift);

                        break;
        }
        return r;
                        break;
        }
        return r;

diff --git a/qcsrc/menu/xonotic/listbox.c b/qcsrc/menu/xonotic/listbox.c
index ce08d4bf4d762985dda216d1d54aa69a4235cd51..f0df7216db09a65d0a96bf8fa138516c0d5087b7 100644 (file)
--- 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;
 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
 }
 #endif

diff --git a/qcsrc/menu/xonotic/maplist.c b/qcsrc/menu/xonotic/maplist.c
index 9bce96dfd776bdd0520eee3545873211be46732e..88be8167900674e07a537be087aff6c2a52615e6 100644 (file)
--- 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));
 {
        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';
 }
 
 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)));
 
        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
                        me.setSelected(me, MapInfo_FindName_firstResult);
        }
        else

-               return keyDownListBox(me, scan, ascii, shift);
+               return SUPER(XonoticMapList).keyDown(me, scan, ascii, shift);

        return 1;
 }
 
        return 1;
 }
 

diff --git a/qcsrc/menu/xonotic/playerlist.c b/qcsrc/menu/xonotic/playerlist.c
index 4406e58055b6232a0809f5ea48f48d8f62279866..e616c4fa66fcd3cb7dc4e8b6b5f0608c36489f24 100644 (file)
--- 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';
 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)));
 
        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 27d5721afd3c6d432e50fc50e15049989c0a7548..6f4851c99460046744f5e045ec9205004dd13c75 100644 (file)
--- 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;
 
        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);
 
        // 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)
 {
 
 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;
 }
        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 0281a542db6db7cda64db38a99461a28efbfe16b..2591356a0971bab75284940d67c0a44d97a8eb66 100644 (file)
--- 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);
                }
                        if(!found)
                                me.setChecked(me, 1);
                }

-       drawCheckBox(me);
+       SUPER(XonoticRadioButton).draw(me);

 }
 void saveCvarsXonoticRadioButton(entity me)
 {
 }
 void saveCvarsXonoticRadioButton(entity me)
 {

diff --git a/qcsrc/menu/xonotic/serverlist.c b/qcsrc/menu/xonotic/serverlist.c
index d4b01e28207a0cad033622b03594a2e0f0036e06..860bc739b107d515be1493b6f1c4723999cfd051 100644 (file)
--- 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;
 {
        float save;
        save = me.selectedItem;

-       setSelectedListBox(me, i);
+       SUPER(XonoticServerList).setSelected(me, i);

        /*
        if(me.selectedItem == save)
                return;
        /*
        if(me.selectedItem == save)
                return;


@@ -317,7 +317,7 @@ void drawXonoticServerList(entity me)
                me.ipAddressBoxFocused = me.ipAddressBox.focused;
        }
 
                me.ipAddressBoxFocused = me.ipAddressBox.focused;
        }
 

-       drawListBox(me);
+       SUPER(XonoticServerList).draw(me);

 }
 void ServerList_PingSort_Click(entity btn, entity 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)
 {
 }
 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));
 
        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;
                }
        }
                        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;
                return 1;
        else if(!me.controlledTextbox)
                return 0;

diff --git a/qcsrc/menu/xonotic/skinlist.c b/qcsrc/menu/xonotic/skinlist.c
index 78ff80ca40306d73070eff7a543e1d3dedfe54d5..05820bf63c059e784a4ad4c6bf252ec074f73620 100644 (file)
--- 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';
 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)));
 
        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 1;
        }
        else

-               return keyDownListBox(me, scan, ascii, shift);
+               return SUPER(XonoticSkinList).keyDown(me, scan, ascii, shift);

 }
 #endif
 }
 #endif

diff --git a/qcsrc/menu/xonotic/slider.c b/qcsrc/menu/xonotic/slider.c
index 134557da7dcd9bd1c12065e89f213d78fea799d1..a2e22a553c02dfb3591140a19ac55f3072ace32d 100644 (file)
--- 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)
        {
 {
        if(val != me.value)
        {

-               setValueSlider( me, val );
+               SUPER(XonoticSlider).setValue( me, val );

                me.saveCvars(me);
        }
 }
                me.saveCvars(me);
        }
 }

diff --git a/qcsrc/menu/xonotic/slider_decibels.c b/qcsrc/menu/xonotic/slider_decibels.c
index ba7cffc22f049b99564ca11fb7582225716b90db..8ba5a235f95a15b0c0b64db21b77b900023fc7b8 100644 (file)
--- 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 "OFF";
        else if(v >= -0.1)
                return "MAX";

-       return strcat(valueToTextSlider(me, v), " dB");
+       return strcat(SUPER(XonoticDecibelsSlider).valueToText(me, v), " dB");

 }
 
 #endif
 }
 
 #endif

diff --git a/qcsrc/menu/xonotic/tab.c b/qcsrc/menu/xonotic/tab.c
index d771d7157b65355c92cdbe28bfb96764bb7eabf4..42d952e96ad0498c1e712ddf5aaf200bd17ca31d 100644 (file)
--- a/qcsrc/menu/xonotic/tab.c
+++ b/qcsrc/menu/xonotic/tab.c
@@ -25,6 +25,6 @@ ENDCLASS(XonoticTab)
 void showNotifyXonoticTab(entity me)
 {
        loadAllCvars(me);
 void showNotifyXonoticTab(entity me)
 {
        loadAllCvars(me);

-       showNotifyContainer(me);
+       SUPER(XonoticTab).showNotify(me);

 }
 #endif
 }
 #endif

diff --git a/qcsrc/menu/xonotic/textlabel.c b/qcsrc/menu/xonotic/textlabel.c
index 020f79035f1bf05c8b6a515c5e5878809f6c6b5c..d0107525f980a559062f1cc0adee43d418205a75 100644 (file)
--- 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)
 {
 }
 void drawXonoticTextLabel(entity me)
 {

-       drawLabel(me);
+       SUPER(XonoticTextLabel).draw(me);

 }
 #endif
 }
 #endif

diff --git a/qcsrc/menu/xonotic/textslider.c b/qcsrc/menu/xonotic/textslider.c
index 2236bc51fe362b88705c10b353e0e57b6e5ef7fe..0c0da18aa3f4bc30a05ad5e7bceba9788cfa21e6 100644 (file)
--- 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)
        {
 {
        if(val != me.value)
        {

-               setValueSlider( me, val );
+               SUPER(XonoticTextSlider).setValue( me, val );

                me.saveCvars(me);
        }
 }
                me.saveCvars(me);
        }
 }

diff --git a/qcsrc/menu/xonotic/weaponslist.c b/qcsrc/menu/xonotic/weaponslist.c
index 012f7bc7e68ea7e739e4028bbddbae5e984314f4..d800005e382bdfb85d51314e2b3ca3b0dc4c87c6 100644 (file)
--- 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);
                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)
 {
 }
 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)
 {
 }
 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));
 
        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;
 {
        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;
        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;
        }
                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;
 }
                return 1;
        return 0;
 }