Merge remote-tracking branch 'origin/divVerent/new-laser-by-morphed'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / item / image.c

diff --git a/qcsrc/menu/item/image.c b/qcsrc/menu/item/image.c
index e44f39efbbe3660113e8702e1cd158d710e80400..a7e63b0e116f88c2c1327794a436a7a03fda599b 100644 (file)
--- a/qcsrc/menu/item/image.c
+++ b/qcsrc/menu/item/image.c
@@ -14,19 +14,20 @@ ENDCLASS(Image)
 #endif
 
 #ifdef IMPLEMENTATION
-string toStringImage(entity me)
+string Image_toString(entity me)
 {
        return me.src;
 }
-void configureImageImage(entity me, string path)
+void Image_configureImage(entity me, string path)
 {
        me.src = path;
 }
-void drawImage(entity me)
+void Image_draw(entity me)
 {
        draw_Picture(me.imgOrigin, me.src, me.imgSize, me.color, 1);
+       SUPER(Image).draw(me);
 }
-void updateAspectImage(entity me)
+void Image_updateAspect(entity me)
 {
        float asp;
        if(me.size_x <= 0 || me.size_y <= 0)
@@ -59,7 +60,7 @@ void updateAspectImage(entity me)
                me.imgOrigin = '0.5 0.5 0' - 0.5 * me.imgSize;
        }
 }
-void resizeNotifyImage(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void Image_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
        SUPER(Image).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
        me.updateAspect(me);