X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_quake3.qc;h=7c1a582879ea5f3a64cc68de0869c075994df2ae;hp=30f1e8f8df5abbcd6d485f3cd2e99d16aa8347ad;hb=71e6c75bc408ae5a116f296797c49c0cef7be113;hpb=28931c8069eb1d283f01a26f31ad91d921294d9c

diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index 30f1e8f8df..7c1a582879 100644
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -70,9 +70,9 @@ void target_give_init()
 {
 	entity targ;
 	for (targ = world; (targ = find(targ, targetname, self.target)); ) {
-		if (targ.classname == "weapon_rocketlauncher") {
+		if (targ.classname == "weapon_rocketlauncher" || targ.classname == "weapon_devastator") {
 			self.ammo_rockets += targ.count * WEP_CVAR(devastator, ammo);
-			self.netname = "rocketlauncher";
+			self.netname = "devastator";
 		}
 		else if (targ.classname == "weapon_plasmagun") {
 			self.ammo_rockets += targ.count * WEP_CVAR_PRI(hagar, ammo); // WEAPONTODO
@@ -82,18 +82,18 @@ void target_give_init()
 				self.netname = strcat(self.netname, " hagar");
 		}
 		else if (targ.classname == "weapon_bfg") {
-			self.ammo_cells += targ.count * autocvar_g_balance_crylink_primary_ammo;
+			self.ammo_cells += targ.count * WEP_CVAR_PRI(crylink, ammo);
 			if(self.netname == "")
 				self.netname = "crylink";
 			else
 				self.netname = strcat(self.netname, " crylink");
 		}
-		else if (targ.classname == "weapon_grenadelauncher") {
-			self.ammo_rockets += targ.count * autocvar_g_balance_mortar_primary_ammo; // WEAPONTODO
+		else if (targ.classname == "weapon_grenadelauncher" || targ.classname == "weapon_mortar") {
+			self.ammo_rockets += targ.count * WEP_CVAR_PRI(mortar, ammo); // WEAPONTODO
 			if(self.netname == "")
-				self.netname = "grenadelauncher";
+				self.netname = "mortar";
 			else
-				self.netname = strcat(self.netname, " grenadelauncher");
+				self.netname = strcat(self.netname, " mortar");
 		}
 		else if (targ.classname == "item_armor_body")
 			self.armorvalue = 100;