Merge branch 'master' into Mario/vaporizer_damage

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / weaponslist.qc

diff --git a/qcsrc/menu/xonotic/weaponslist.qc b/qcsrc/menu/xonotic/weaponslist.qc
index f4bcf4feae2e15d09504cd0dbb7e21fbe089e4ea..1f2a4e19e65b2fb2caeecab9da8c2b13e6576df7 100644 (file)
--- a/qcsrc/menu/xonotic/weaponslist.qc
+++ b/qcsrc/menu/xonotic/weaponslist.qc
@@ -2,16 +2,16 @@
 #define WEAPONSLIST_H
 #include "listbox.qc"
 CLASS(XonoticWeaponsList, XonoticListBox)
-       METHOD(XonoticWeaponsList, configureXonoticWeaponsList, void(entity))
-       METHOD(XonoticWeaponsList, toString, string(entity))
+       METHOD(XonoticWeaponsList, configureXonoticWeaponsList, void(entity));
+       METHOD(XonoticWeaponsList, toString, string(entity));
        ATTRIB(XonoticWeaponsList, rowsPerItem, float, 1)
-       METHOD(XonoticWeaponsList, draw, void(entity))
-       METHOD(XonoticWeaponsList, drawListBoxItem, void(entity, int, vector, bool, bool))
-       METHOD(XonoticWeaponsList, resizeNotify, void(entity, vector, vector, vector, vector))
-       METHOD(XonoticWeaponsList, keyDown, float(entity, float, float, float))
+       METHOD(XonoticWeaponsList, draw, void(entity));
+       METHOD(XonoticWeaponsList, drawListBoxItem, void(entity, int, vector, bool, bool));
+       METHOD(XonoticWeaponsList, resizeNotify, void(entity, vector, vector, vector, vector));
+       METHOD(XonoticWeaponsList, keyDown, float(entity, float, float, float));
        ATTRIB(XonoticWeaponsList, realFontSize, vector, '0 0 0')
        ATTRIB(XonoticWeaponsList, realUpperMargin, float, 0)
-       METHOD(XonoticWeaponsList, mouseDrag, float(entity, vector))
+       METHOD(XonoticWeaponsList, mouseDrag, float(entity, vector));
 ENDCLASS(XonoticWeaponsList)
 entity makeXonoticWeaponsList();
 void WeaponsList_MoveUp_Click(entity btn, entity me);
@@ -105,7 +105,7 @@ void XonoticWeaponsList_drawListBoxItem(entity me, int i, vector absSize, bool i
        e = get_weaponinfo(stof(argv(i)));
        string msg = e.message;
        if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
-               msg = sprintf(_("%s (mutator weapon)"), msg);
+               msg = strcat(msg, "*");
 
        vector save_fontscale = draw_fontscale;
        float f = draw_CondensedFontFactor(msg, false, me.realFontSize, 1);