Commit dd75397d authored by terencehill's avatar terencehill

Fix %W in chat messages

parent 936e0798
Pipeline #5578143 passed with stages
in 22 minutes and 17 seconds
......@@ -229,10 +229,15 @@ string formatmessage(entity this, string msg)
n = 7;
ammoitems = "batteries";
if(this.items & ITEM_Plasma.m_itemid) ammoitems = ITEM_Plasma.m_name;
if(this.items & ITEM_Cells.m_itemid) ammoitems = ITEM_Cells.m_name;
if(this.items & ITEM_Rockets.m_itemid) ammoitems = ITEM_Rockets.m_name;
if(this.items & ITEM_Shells.m_itemid) ammoitems = ITEM_Shells.m_name;
switch((PS(this).m_weapon).ammo_field)
{
case ammo_shells: ammoitems = ITEM_Shells.m_name; break;
case ammo_nails: ammoitems = ITEM_Bullets.m_name; break;
case ammo_rockets: ammoitems = ITEM_Rockets.m_name; break;
case ammo_cells: ammoitems = ITEM_Cells.m_name; break;
case ammo_plasma: ammoitems = ITEM_Plasma.m_name; break;
case ammo_fuel: ammoitems = ITEM_JetpackFuel.m_name; break;
}
WarpZone_crosshair_trace(this);
cursor = trace_endpos;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment