Move q3compat powerup spawnfuncs to quake3.qc and update map entity comments

diff --git a/qcsrc/common/mutators/mutator/buffs/all.inc b/qcsrc/common/mutators/mutator/buffs/all.inc
index 3a4031ef8e052e8e9b27674a6961040c9f197361..1572a75e55d9d9dc0599b05946f0c7a3eb84a542 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/all.inc
+++ b/qcsrc/common/mutators/mutator/buffs/all.inc
@@ -2,15 +2,15 @@ string Buff_UndeprecateName(string buffname)
 {
     switch(buffname)
     {
-        case "ammoregen": return "ammo";               // Q3TA ammoregen
-        case "doubler": return "inferno";              // Q3TA doubler
-        case "scout": return "bash";                   // Q3TA scout
-        case "guard": return "resistance";             // Q3TA guard
-        case "revival": case "regen": return "medic";  // WOP revival, Q3A regen
-        case "jumper": return "jump";                  // WOP jumper
-        case "invulnerability": return "vampire";      // Q3TA invulnerability
-        case "kamikaze": return "vengeance";           // Q3TA kamikaze
-        case "teleporter": return "swapper";           // Q3A personal teleporter
+        case "ammoregen": return "ammo";               // Q3TA ammoregen
+        case "doubler": return "inferno";              // Q3TA doubler
+        case "scout": return "bash";                   // Q3TA scout
+        case "guard": return "resistance";             // Q3TA guard
+        case "revival": case "regen": return "medic";  // WOP revival, Q3A regen
+        case "jumper": return "jump";                  // WOP jumper
+        case "invulnerability": return "vampire";      // Q3TA invulnerability
+        case "kamikaze": return "vengeance";           // Q3TA kamikaze
+        case "teleporter": return "swapper";           // Q3A personal teleporter
         default: return buffname;
     }
 }

diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh
index 85ac8bd309f1dc4120589040922a9b3485502e2a..f4e59b58cf2e9be7314f7e23b62ac448474be554 100644 (file)
--- a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh
+++ b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh
@@ -48,8 +48,6 @@ REGISTER_ITEM(Invisibility, Powerup) {
 }
 
 SPAWNFUNC_ITEM(item_invisibility, ITEM_Invisibility)
-// compat
-SPAWNFUNC_ITEM(item_invis, ITEM_Invisibility)
 
 CLASS(Invisibility, Powerups)
     ATTRIB(Invisibility, netname, string, "invisibility");

diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh b/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh
index 938fb66aebab5cfba28add0d354401e8d7289933..fff1fd9b8c5a8ba34d6a8879fc36bfa7179260bf 100644 (file)
--- a/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh
+++ b/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh
@@ -49,8 +49,6 @@ REGISTER_ITEM(Speed, Powerup) {
 }
 
 SPAWNFUNC_ITEM(item_speed, ITEM_Speed)
-// compat
-SPAWNFUNC_ITEM(item_haste, ITEM_Speed)
 
 CLASS(Speed, Powerups)
     ATTRIB(Speed, netname, string, "speed");

diff --git a/qcsrc/server/compat/quake.qc b/qcsrc/server/compat/quake.qc
index 279b3155db68baf2296de2f3e8a5a382d40ebc22..cd5f78b746450e31d2301dd7a584d6395f2d233c 100644 (file)
--- a/qcsrc/server/compat/quake.qc
+++ b/qcsrc/server/compat/quake.qc
@@ -8,7 +8,7 @@
  * QUAKE 1 ENTITIES - So people can play quake1 maps with the xonotic weapons
  ***********************
  weapon_nailgun handled in quake3.qc
- item_armor1 handled in items.qc
+ item_armor1 handled in items/spawning.qc
 */
 
 SPAWNFUNC_WEAPON(weapon_supernailgun, WEP_HAGAR)

diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc
index 32c42d35400a151550fd309a038ad2513525900f..36fb995083102ccdf4f54f0cb7c27ef7d9bb70ba 100644 (file)
--- a/qcsrc/server/compat/quake3.qc
+++ b/qcsrc/server/compat/quake3.qc
@@ -23,27 +23,24 @@
  ***********************
 
  * Map entities NOT handled in this file:
- holdable_invulnerability      Q3TA    buffs mutator
- holdable_kamikaze             Q3TA    buffs mutator
- holdable_teleporter           Q3A     buffs mutator
- item_ammoregen                        Q3TA    buffs mutator
- item_doubler                  Q3TA    buffs mutator
- item_guard                    Q3TA    buffs mutator
- item_scout                    Q3TA    buffs mutator
- item_armor_jacket             CPMA    quake2.qc
- item_flight                   Q3A     buffs mutator
- item_haste                    Q3A     buffs mutator
- item_health                   Q3A     quake.qc
- item_health_large             Q3A     items.qc
- item_health_small             Q3A     health.qh
- item_health_mega              Q3A     health.qh
- item_invis                    Q3A     buffs mutator
- item_quad                     Q3A     items.qc
- item_regen                    Q3A     buffs mutator
- weapon_machinegun             Q3A     machinegun.qh
- weapon_grenadelauncher                Q3A     mortar.qh
- weapon_rocketlauncher         Q3A     devastator.qh
- CTF spawnfuncs handled in sv_ctf.qc
+ holdable_invulnerability    Q3TA   buffs/all.inc
+ holdable_kamikaze           Q3TA   buffs/all.inc
+ holdable_teleporter         Q3A    buffs/all.inc
+ item_ammoregen              Q3TA   buffs/all.inc
+ item_doubler                Q3TA   buffs/all.inc
+ item_guard                  Q3TA   buffs/all.inc
+ item_scout                  Q3TA   buffs/all.inc
+ item_armor_jacket           CPMA   quake2.qc
+ item_flight                 Q3A    buffs/all.inc
+ item_health                 Q3A    quake.qc
+ item_health_large           Q3A    items/spawning.qc
+ item_health_small           Q3A    health.qh
+ item_health_mega            Q3A    health.qh
+ item_regen                  Q3A    buffs/all.inc
+ weapon_machinegun           Q3A    machinegun.qh
+ weapon_grenadelauncher      Q3A    mortar.qh
+ weapon_rocketlauncher       Q3A    devastator.qh
+ * CTF spawnfuncs in sv_ctf.qc
 
  NOTE: for best experience, you need to swap MGs with SGs in the map or it won't have a MG
 */
@@ -99,8 +96,11 @@ SPAWNFUNC_ITEM(item_armor_combat, ITEM_ArmorBig)
 SPAWNFUNC_ITEM(item_armor_shard, ITEM_ArmorSmall)
 SPAWNFUNC_ITEM(item_armor_green, ITEM_ArmorMedium) // CCTF
 
-// Battle Suit
+// Powerups
+SPAWNFUNC_ITEM(item_quad, ITEM_Strength)
 SPAWNFUNC_ITEM(item_enviro, ITEM_Shield)
+SPAWNFUNC_ITEM(item_haste, ITEM_Speed)
+SPAWNFUNC_ITEM(item_invis, ITEM_Invisibility)
 
 // medkit -> armor (we have no holdables)
 SPAWNFUNC_ITEM(holdable_medkit, ITEM_ArmorBig)

diff --git a/qcsrc/server/items/spawning.qc b/qcsrc/server/items/spawning.qc
index ef4a838d351703e69e00b0ef83e7b0797de59e3c..4c5b9d17aa8f0aa80ace15d8b44a1ae6255664ca 100644 (file)
--- a/qcsrc/server/items/spawning.qc
+++ b/qcsrc/server/items/spawning.qc
@@ -145,5 +145,3 @@ SPAWNFUNC_ITEM(item_health25, ITEM_HealthMedium)
 SPAWNFUNC_ITEM(item_health_large, ITEM_HealthBig)
 
 SPAWNFUNC_ITEM(item_health100, ITEM_HealthMega)
-
-SPAWNFUNC_ITEM(item_quad, ITEM_Strength)