Use weaponinfo to get weapon sprite info

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapons.qc

diff --git a/qcsrc/common/weapons/weapons.qc b/qcsrc/common/weapons/weapons.qc
index e03475d4729897c37dc1012a910f61bf8cc08289..121df37b2129cce7f680ce5bdcdb90206d7461cf 100644 (file)
--- a/qcsrc/common/weapons/weapons.qc
+++ b/qcsrc/common/weapons/weapons.qc
@@ -74,7 +74,7 @@ WepSet ReadWepSet()
 }
 #endif
 
-void register_weapon(float id, WepSet bit, float(float) func, .float ammotype, float i, float weapontype, float pickupbasevalue, string modelname, string shortname, string wname)
+void register_weapon(float id, WepSet bit, float(float) func, .float ammotype, float i, float weapontype, float pickupbasevalue, vector clr, string modelname, string shortname, string wname)
 {
        entity e;
        weapon_info[id - 1] = e = spawn();
@@ -85,10 +85,11 @@ void register_weapon(float id, WepSet bit, float(float) func, .float ammotype, f
        e.message = wname;
        //e.items = ammotype;
        e.weapon_func = func;
+       e.wpcolor = clr;
        e.mdl = modelname;
        e.model = strzone(strcat("models/weapons/g_", modelname, ".md3"));
        e.spawnflags = weapontype;
-       e.model2 = strzone(strcat("wpn-", e.mdl));
+       e.model2 = strzone(strcat("wpn-", ftos(id)));
        e.impulse = i;
        e.bot_pickupbasevalue = pickupbasevalue;
        e.current_ammo = ammotype;