From: LegendaryGuard <rootuser999@gmail.com>
Date: Mon, 10 Jul 2023 15:19:00 +0000 (+0200)
Subject: Merge branch 'master' into LegendaryGuard/tandem_nade
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FLegendaryGuard%2Ftandem_nade;p=xonotic%2Fxonotic-data.pk3dir.git

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

c6ed5e0974c56d67a019b6548f513a35aba9edcb
diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
index 88431410c,12997c0b5..75946ef0f
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@@ -1331,16 -972,16 +1331,16 @@@ void nade_boom(entity this
  	if(this.takedamage)
  	switch ( REGISTRY_GET(Nades, STAT(NADE_BONUS_TYPE, this)) )
  	{
- 		case NADE_TYPE_NAPALM:      nade_napalm_boom(this);       break;
- 		case NADE_TYPE_ICE:         nade_ice_boom(this);          break;
- 		case NADE_TYPE_TRANSLOCATE: nade_translocate_boom(this);  break;
- 		case NADE_TYPE_SPAWN:       nade_spawn_boom(this);        break;
- 		case NADE_TYPE_HEAL:        nade_heal_boom(this);         break;
- 		case NADE_TYPE_TANDEM:      nade_tandem_boom(this);       break;
- 		case NADE_TYPE_ENTRAP:      nade_entrap_boom(this);       break;
- 		case NADE_TYPE_VEIL:        nade_veil_boom(this);         break;
- 		case NADE_TYPE_AMMO:        nade_ammo_boom(this);         break;
- 		case NADE_TYPE_DARK:        nade_darkness_boom(this);     break;
+ 		case NADE_TYPE_NAPALM:      nade_napalm_boom(this);      break;
+ 		case NADE_TYPE_ICE:         nade_ice_boom(this);         break;
+ 		case NADE_TYPE_TRANSLOCATE: nade_translocate_boom(this); break;
+ 		case NADE_TYPE_SPAWN:       nade_spawn_boom(this);       break;
+ 		case NADE_TYPE_HEAL:        nade_heal_boom(this);        break;
 -		case NADE_TYPE_MONSTER:     nade_monster_boom(this);     break;
++		case NADE_TYPE_TANDEM:      nade_tandem_boom(this);      break;
+ 		case NADE_TYPE_ENTRAP:      nade_entrap_boom(this);      break;
+ 		case NADE_TYPE_VEIL:        nade_veil_boom(this);        break;
+ 		case NADE_TYPE_AMMO:        nade_ammo_boom(this);        break;
+ 		case NADE_TYPE_DARKNESS:    nade_darkness_boom(this);    break;
  	}
  
  	IL_EACH(g_projectiles, it.classname == "grapplinghook" && it.aiment == this,