Merge branch 'master' into LegendaryGuard/bai_mod

diff --cc qcsrc/client/hud/panel/centerprint.qc
Simple merge

diff --cc qcsrc/client/hud/panel/scoreboard.qc
index 0b788fdb1eead216f03cdd8b913f05a7595339bc,39deff0d1c36e202696428237d93589679eb4195..dbeaf61dbcf8a8d252c7a0a9013bd5eb3c0e667f
--- 1/qcsrc/client/hud/panel/scoreboard.qc
--- 2/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@@ -2271,10 -1982,10 +2419,12 @@@ void Scoreboard_Draw(
                pos = Scoreboard_MakeTable(pos, tm, panel_bg_color, bg_size);
        }
  
 +      pos = Scoreboard_MedalStats_Draw(pos);
 +      
        if (Scoreboard_AccuracyStats_WouldDraw(pos.y))
                pos = Scoreboard_AccuracyStats_Draw(pos, panel_bg_color, bg_size);
+       if (Scoreboard_ItemStats_WouldDraw(pos.y))
+               pos = Scoreboard_ItemStats_Draw(pos, panel_bg_color, bg_size);
  
        if(MUTATOR_CALLHOOK(ShowRankings)) {
                string ranktitle = M_ARGV(0, string);

diff --cc qcsrc/common/ent_cs.qc
Simple merge

diff --cc qcsrc/common/items/inventory.qh
index c0a94707bc3b5f9dccb4191924f1b89ead07ac9f,abc367d51389615815274c79100f7a462e208e31..ebcddf2b21cd75fac61fa814969e02be6bb2ee9e
--- 1/qcsrc/common/items/inventory.qh
--- 2/qcsrc/common/items/inventory.qh
+++ b/qcsrc/common/items/inventory.qh
@@@ -37,21 -37,18 +37,36 @@@ STATIC_INIT(Inventory
  #endif
  
  #ifdef CSQC
++<<<<<<< HEAD
 +#include <client/hud/hud.qh>
 +
 +//Inventory g_inventory;
 +Inventory inventoryslots[255];
 +float last_pickup_timer;
 +entity last_pickup_item;
 +int last_pickup_times;
 +NET_HANDLE(ENT_CLIENT_INVENTORY, bool isnew)
 +{
 +    make_pure(this);
 +    //g_inventory = this;
 +      
 +      float entnum = ReadByte() - 1;
 +      inventoryslots[entnum] = this;
 +      
++=======
+ Inventory g_inventory;
+ void Inventory_remove(entity this)
+ {
+     if(g_inventory == this)
+         g_inventory = NULL;
+ }
+ 
+ NET_HANDLE(ENT_CLIENT_INVENTORY, bool isnew)
+ {
+     make_pure(this);
+     g_inventory = this;
+     this.entremove = Inventory_remove;
++>>>>>>> master
      const int majorBits = Readbits(Inventory_groups_major);
      for (int i = 0; i < Inventory_groups_major; ++i) {
          if (!(majorBits & BIT(i))) {
@@@ -164,22 -137,22 +179,36 @@@ bool Inventory_customize(entity this, e
  void Inventory_new(PlayerState this)
  {
      Inventory inv = NEW(Inventory);
 -    setcefc(inv, Inventory_customize);
 +    if(!g_duel) setcefc(inv, Inventory_customize);
      Net_LinkEntity((inv.owner = this).inventory = inv, false, 0, Inventory_Send);
  }
- void Inventory_delete(entity e) { delete(e.inventory.inventory); delete(e.inventory); }
+ void Inventory_delete(entity e) { delete(e.inventory); }
  void Inventory_update(entity e) { e.inventory.SendFlags = 0xFFFFFF; }
  
+ void Inventory_clear(entity store)
+ {
+     // NOTE: you will need to perform Inventory_update after this to update the storage entity
+     // (unless store is the storage entity)
+     FOREACH(Items, true, {
+         .int fld = inv_items[it.m_id];
+         store.(fld) = 0;
+     });
+ }
+ 
  void InventoryStorage_attach(entity e) { e.inventory_store = NEW(Inventory); e.inventory_store.drawonlytoclient = e; }
++<<<<<<< HEAD
 +void InventoryStorage_detach(entity e) { delete(e.inventory_store); }
 +
 +void Inventory_ClearAll() {
 +      FOREACH_CLIENT(IS_PLAYER(it), {
 +              entity store = PS(it);          
 +              FOREACH(Items, true, {
 +                      store.inventory.inv_items[it.m_id] = 0;
 +              });
 +        Inventory_update(store);
 +      });
 +}
++=======
+ void InventoryStorage_delete(entity e) { delete(e.inventory_store); }
++>>>>>>> master
  #endif

diff --cc qcsrc/server/client.qc
Simple merge

diff --cc qcsrc/server/client.qh
Simple merge

diff --cc qcsrc/server/command/cmd.qc
Simple merge

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge

diff --cc qcsrc/server/command/vote.qc
Simple merge

diff --cc qcsrc/server/world.qc
Simple merge