X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_items.qc;h=40abd18b135fe920265d197357927a458308f990;hp=bf70da0286a837b98fb68fb2adbff927f8d30254;hb=94a967120c8bfe0d4ffd95690b97e5af297dfc05;hpb=ad77b9efa833b1ef942252c7f86565c2c4cec52d

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index bf70da028..40abd18b1 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -282,8 +282,6 @@ float have_pickup_item(void)
 			return TRUE;
 		if(autocvar_g_powerups == 0)
 			return FALSE;
-		if(g_lms)
-			return FALSE;
 		if(g_ca)
 			return FALSE;
 		if(g_arena)
@@ -295,8 +293,6 @@ float have_pickup_item(void)
 			return TRUE;
 		if(autocvar_g_pickup_items == 0)
 			return FALSE;
-		if(g_lms)
-			return FALSE;
 		if(g_ca)
 			return FALSE;
 		if(g_weaponarena)
@@ -630,16 +626,16 @@ float Item_GiveTo(entity item, entity player)
 			if (clienttype(player) == CLIENTTYPE_REAL)
 			{
 				if(player.health <= 5)
-					AnnounceTo(player, "lastsecond");
+					Send_Notification(NOTIF_ONE, player, MSG_ANNCE, ANNCE_MINSTAGIB_LASTSECOND);
 				else if(player.health < 50)
-					AnnounceTo(player, "narrowly");
+					Send_Notification(NOTIF_ONE, player, MSG_ANNCE, ANNCE_MINSTAGIB_NARROWLY);
 			}
 			// sound not available
 			// else if(item.items == IT_CELLS)
 			//	AnnounceTo(player, "ammo");
 
 			if (WEPSET_CONTAINS_EW(item, WEP_MINSTANEX))
-				W_GiveWeapon (player, WEP_MINSTANEX, item.netname);
+				W_GiveWeapon (player, WEP_MINSTANEX);
 			player.health = 100;
 		}
 
@@ -657,7 +653,7 @@ float Item_GiveTo(entity item, entity player)
 			// sound not available
 			// AnnounceTo(player, "_lives");
 			player.armorvalue = bound(player.armorvalue, 999, player.armorvalue + autocvar_g_minstagib_extralives);
-			sprint(player, "^3You picked up some extra lives\n");
+			Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_EXTRALIVES);
 		}
 
 		// invis powerup
@@ -709,7 +705,7 @@ float Item_GiveTo(entity item, entity player)
 				pickedup = TRUE;
 				for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 					if(WEPSET_CONTAINS_AW(it, i))
-						W_GiveWeapon (player, i, item.netname);
+						W_GiveWeapon(player, i);
 			}
 		}