X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_items.qc;h=88b4c7a032e7a85b9cc873850a4c6693be5b409f;hp=2e537b4a3428877827eb62376e29d1bdcfb7d4ad;hb=c2bcf0db4a1d1460ef667f26c51efedfccfa6ba0;hpb=a59c12d71fa599891fc1d658aeea2f546d89d9e4

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 2e537b4a3..88b4c7a03 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -48,7 +48,7 @@ void ItemDrawSimple()
 
 void ItemRead(float _IsNew)
 {
-    float sf = ReadByte();
+    int sf = ReadByte();
 
     if(sf & ISF_LOCATION)
     {
@@ -599,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)
@@ -855,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?
@@ -1390,10 +1390,7 @@ void spawnfunc_target_items (void)
 		else
 		{
 			error("invalid spawnflags");
-#ifdef GMQCC
-			itemprefix = string_null;
-			valueprefix = string_null;
-#endif
+			itemprefix = valueprefix = string_null;
 		}
 
 		self.netname = "";
@@ -1458,8 +1455,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)