Merge branch 'master' into Lyberta/KillSound

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / compat / wop.qc

diff --git a/qcsrc/server/compat/wop.qc b/qcsrc/server/compat/wop.qc
index 6d53e18efb12b982b615ed9d8c57fc3d22e39c65..6c69859fdfe0c6e748acc5b227227f49d5e9626c 100644 (file)
--- a/qcsrc/server/compat/wop.qc
+++ b/qcsrc/server/compat/wop.qc
@@ -1,5 +1,7 @@
 #include "wop.qh"
 
+#include <server/defs.qh>
+#include <server/miscfunctions.qh>
 #include <common/weapons/_all.qh>
 // #include <server/mutators/gamemode.qh>
 
@@ -29,12 +31,14 @@ spawnfunc(item_haste);
 spawnfunc(item_health_medium);
 spawnfunc(item_health_mega);
 spawnfunc(item_invis);
-spawnfunc(item_medic);
 
 //***********************
 //WORD OF PADMAN ENTITIES - So people can play wop maps with the xonotic weapons
 //***********************
 
+//spawnfunc(item_revival)     /* handled by buffs mutator */
+//spawnfunc(item_jumper)      /* handled by buffs mutator */
+
 spawnfunc(weapon_punchy)       { spawnfunc_weapon_arc(this);                   }
 spawnfunc(weapon_nipper)       { spawnfunc_weapon_machinegun(this);    }
 spawnfunc(weapon_pumper)       { spawnfunc_weapon_shotgun(this);               }
@@ -56,7 +60,7 @@ spawnfunc(ammo_imperius)      { spawnfunc_item_cells(this);                   }
 spawnfunc(item_padpower)       { spawnfunc_item_quad(this);                    }
 spawnfunc(item_climber)                { spawnfunc_item_invincible(this);              }
 spawnfunc(item_speedy)         { spawnfunc_item_haste(this);                   }
-spawnfunc(item_jump)           { spawnfunc_item_jetpack(this);                 }
 spawnfunc(item_visionless)     { spawnfunc_item_invis(this);                   }
-spawnfunc(item_revival)                { spawnfunc_item_medic(this);                   }
 spawnfunc(item_armor_padshield)        { spawnfunc_item_armor_mega(this);      }
+
+spawnfunc(holdable_floater)            { spawnfunc_item_jetpack(this);         }