From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 31 Mar 2012 16:36:38 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/weapons-field-rewrite
X-Git-Tag: xonotic-v0.7.0~348^2~1^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=20194b24b0b3a019e53ce08ed100b78f79f5652b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/weapons-field-rewrite

Conflicts:
	qcsrc/server/t_items.qc
---

20194b24b0b3a019e53ce08ed100b78f79f5652b
diff --cc qcsrc/server/t_items.qc
index eaba390ed,5b9a2e5f9..93b857fec
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@@ -376,10 -377,8 +376,8 @@@ float Item_GiveTo(entity item, entity p
  			// else if(item.items == IT_CELLS)
  			//	AnnounceTo(player, "ammo");
  
 -			if (item.weapons & WEPBIT_MINSTANEX)
 +			if (WEPSET_CONTAINS_EW(item, WEP_MINSTANEX))
  				W_GiveWeapon (player, WEP_MINSTANEX, item.netname);
- 			if (item.ammo_cells)
- 				player.ammo_cells = bound(player.ammo_cells, 999, player.ammo_cells + autocvar_g_minstagib_ammo_drop);
  			player.health = 100;
  		}
  
@@@ -1106,7 -1112,12 +1116,12 @@@ void weapon_defaultspawnfunc(float wpn
  	if(self.team)
  		f |= FL_NO_WEAPON_STAY;
  
+ 	// stupid minstagib hack, don't ask
+ 	if(g_minstagib)
+ 		if(self.ammo_cells)
+ 			self.ammo_cells = autocvar_g_minstagib_ammo_drop;
+ 
 -	StartItem(e.model, "weapons/weaponpickup.wav", self.respawntime, self.respawntimejitter, e.message, 0, e.weapons, f, weapon_pickupevalfunc, e.bot_pickupbasevalue);
 +	StartItem(e.model, "weapons/weaponpickup.wav", self.respawntime, self.respawntimejitter, e.message, 0, e.weapon, f, weapon_pickupevalfunc, e.bot_pickupbasevalue);
  	if (self.modelindex) // don't precache if self was removed
  		weapon_action(e.weapon, WR_PRECACHE);
  }