From: Mario <mario.mario@y7mail.com>
Date: Fri, 25 Apr 2025 10:29:43 +0000 (+1000)
Subject: Merge branch 'master' into Mario/weapon_impulse_exclusion
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a0c1d761c1b98a9420b327b17aa0920261e94633;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/weapon_impulse_exclusion
---

a0c1d761c1b98a9420b327b17aa0920261e94633
diff --cc qcsrc/common/weapons/all.qh
index 5a018f4bc0,82494c3a1f..3ae3aadcf1
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@@ -46,11 -46,9 +46,11 @@@ STATIC_INIT(WeaponPickup
  #define WepSet_FromWeapon(it) ((it).m_wepset)
  WepSet _WepSet_FromWeapon(int i);
  
 +.int m_impulse;
 +
  #define DEFAULT_FILENAME "weapons_dump.cfg"
  // NOTE: dumpeffectinfo, dumpnotifs, dumpturrets and dumpweapons use similar code
- GENERIC_COMMAND(dumpweapons, "Dump all turrets into " DEFAULT_FILENAME, false) // WEAPONTODO: make this work with other progs than just server
+ GENERIC_COMMAND(dumpweapons, "Dump all weapons into " DEFAULT_FILENAME, false) // WEAPONTODO: make this work with other progs than just server
  {
  	switch(request)
  	{