# HG changeset patch # User GarryMcGooble # Date 1602557503 14400 # Mon Oct 12 22:51:43 2020 -0400 # Node ID 73e29a89648af4fc106b4b25d63c934f985ae8d1 # Parent 37672cb788f4378536a18b2fa9d1f9654fe781a4 Fixed A_CustomPunch not consuming ammo online diff -r 37672cb788f4 -r 73e29a89648a src/thingdef/thingdef_codeptr.cpp --- a/src/thingdef/thingdef_codeptr.cpp Thu Sep 03 10:28:04 2020 -0400 +++ b/src/thingdef/thingdef_codeptr.cpp Mon Oct 12 22:51:43 2020 -0400 @@ -1806,9 +1806,9 @@ { // [BB] If we're the server, tell the client that he lost ammo. if ( weapon->Ammo1 ) - SERVERCOMMANDS_GiveInventory( weapon->Owner->player - players, weapon->Ammo1 ); + SERVERCOMMANDS_TakeInventory( weapon->Owner->player - players, weapon->AmmoType1, weapon->Ammo1->Amount ); if ( weapon->Ammo2 ) - SERVERCOMMANDS_GiveInventory( weapon->Owner->player - players, weapon->Ammo2 ); + SERVERCOMMANDS_TakeInventory( weapon->Owner->player - players, weapon->AmmoType2, weapon->Ammo2->Amount ); } }