From: LegendaryGuard <rootuser999@gmail.com>
Date: Fri, 12 Feb 2021 23:21:47 +0000 (+0100)
Subject: Merge branch 'master' into LegendaryGuard/bai_mod
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=65cb61be9098965fe184060e34db4c0cfe22aa70;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into LegendaryGuard/bai_mod
---

65cb61be9098965fe184060e34db4c0cfe22aa70
diff --cc qcsrc/client/hud/panel/scoreboard.qc
index 0b788fdb1,39deff0d1..dbeaf61db
--- a/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/items/inventory.qh
index c0a94707b,abc367d51..ebcddf2b2
--- a/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