X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=e4e3abace5d370008b45e64b7b1256bc5287170f;hb=31f3d6ab253693e9b44e107d073145d579569d20;hp=319b6f16ff7e3c7c333d8fb3a67e2b360eefbde8;hpb=4ec83e78f5b2db35cfb04027a7205e0f393d78a0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 319b6f16f..e4e3abace 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -219,6 +219,7 @@ string AmmoNameFromWeaponentity(Weapon wep)
 	return ammoitems;
 }
 
+.float old_solid;
 string formatmessage(entity this, string msg)
 {
 	float p, p1, p2;
@@ -230,7 +231,16 @@ string formatmessage(entity this, string msg)
 	p = 0;
 	n = 7;
 
+	IL_EACH(g_items, true,
+	{
+		it.old_solid = it.solid;
+		it.solid = SOLID_BSP;
+	});
 	WarpZone_crosshair_trace(this);
+	IL_EACH(g_items, true,
+	{
+		it.solid = it.old_solid;
+	});
 	cursor = trace_endpos;
 	cursor_ent = trace_ent;