X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_items.qc;h=4455d3fb46a3128ecf541c8d4558286341eb8a4e;hp=0e0209892d447fec334eecfe976d8a368cdd2f92;hb=b0a06888ff894f9d334f6277b996f98ae8a665a0;hpb=bc84852344a61cf02dea8f6db1a1e3a2449b4253

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 0e0209892..4455d3fb4 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -434,7 +434,7 @@ void Item_RespawnCountdown (void)
 				entity wi = get_weaponinfo(self.weapon);
 				if(wi)
 				{
-					name = wi.model2;
+					name = wi.wpmodel;
 					rgb = '1 0 0';
 				}
 			}
@@ -588,7 +588,10 @@ float Item_GiveTo(entity item, entity player)
 			pickedup = TRUE;
 			for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 			if(it & WepSet_FromWeapon(i))
+			{
+				W_DropEvent(WR_PICKUP, player, i, item);
 				W_GiveWeapon(player, i);
+			}
 		}
 	}
 
@@ -596,7 +599,7 @@ float Item_GiveTo(entity item, entity player)
 	{
 		pickedup = TRUE;
 		player.items |= it;
-		sprint (player, strcat("You got the ^2", item.netname, "\n"));
+		Send_Notification(NOTIF_ONE, player, MSG_INFO, INFO_ITEM_WEAPON_GOT, item.netname);
 	}
 
 	if (item.strength_finished)
@@ -647,6 +650,8 @@ void Item_Touch (void)
 
 	if (!IS_PLAYER(other))
 		return;
+	if (other.frozen)
+		return;
 	if (other.deadflag)
 		return;
 	if (self.solid != SOLID_TRIGGER)
@@ -850,7 +855,7 @@ float commodity_pickupevalfunc(entity player, entity item)
 		else if(wi.items & IT_PLASMA)
 			need_plasma = TRUE;
 		else if(wi.items & IT_FUEL)
-			need_cells = TRUE;
+			need_fuel = TRUE;
 	}
 
 	// TODO: figure out if the player even has the weapon this ammo is for?
@@ -1453,8 +1458,6 @@ void spawnfunc_item_fuel_regen(void)
 
 void spawnfunc_item_jetpack(void)
 {
-	if(g_grappling_hook)
-		return; // sorry, but these two can't coexist (same button); spawn fuel instead
 	if(!self.ammo_fuel)
 		self.ammo_fuel = g_pickup_fuel_jetpack;
 	if(start_items & IT_JETPACK)