X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcompat%2Fwop.qc;h=4b7a6d31b30ee480b6f0a1054d729216b2730547;hb=76afe6b4bb64b3f349bcf8aeadd04d0b319a7d01;hp=b8c65d87881f93728ad872782b51299cf218620c;hpb=cf1512beec5b1ebac151fdcf9f44ff4830b37187;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/compat/wop.qc b/qcsrc/server/compat/wop.qc
index b8c65d878..4b7a6d31b 100644
--- a/qcsrc/server/compat/wop.qc
+++ b/qcsrc/server/compat/wop.qc
@@ -1,60 +1,43 @@
 #include "wop.qh"
 
 #include <common/weapons/_all.qh>
-// #include <server/mutators/gamemode.qh>
-
-spawnfunc(weapon_arc);
-spawnfunc(weapon_crylink);
-spawnfunc(weapon_electro);
-spawnfunc(weapon_mortar);
-spawnfunc(weapon_hagar);
-spawnfunc(weapon_machinegun);
-spawnfunc(weapon_devastator);
-spawnfunc(weapon_shotgun);
-spawnfunc(weapon_vortex);
-
-spawnfunc(item_armor_big);
-spawnfunc(item_armor_mega);
-spawnfunc(item_armor_small);
-
-spawnfunc(item_bullets);
-spawnfunc(item_cells);
-spawnfunc(item_quad);
-spawnfunc(item_rockets);
-spawnfunc(item_shells);
+#include <common/stats.qh>
+#include <server/miscfunctions.qh>
+#include <server/items/spawning.qh>
+#include <common/weapons/_all.qh>
 
 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
+//WORLD OF PADMAN ENTITIES - So people can play wop maps with the xonotic weapons
 //***********************
 
-spawnfunc(weapon_punchy)	{ spawnfunc_weapon_arc(this);			}
-spawnfunc(weapon_nipper)	{ spawnfunc_weapon_machinegun(this);	}
-spawnfunc(weapon_pumper)	{ spawnfunc_weapon_shotgun(this);		}
-spawnfunc(weapon_boaster)	{ spawnfunc_weapon_electro(this);		}
-spawnfunc(weapon_splasher)	{ spawnfunc_weapon_vortex(this);		}
-spawnfunc(weapon_bubbleg)	{ spawnfunc_weapon_hagar(this);			}
-spawnfunc(weapon_balloony)	{ spawnfunc_weapon_mortar(this);		}
-spawnfunc(weapon_betty)		{ spawnfunc_weapon_devastator(this);	}
-spawnfunc(weapon_imperius)	{ spawnfunc_weapon_crylink(this);		}
-
-spawnfunc(ammo_pumper)		{ spawnfunc_item_shells(this);			}
-spawnfunc(ammo_nipper)		{ spawnfunc_item_bullets(this);			}
-spawnfunc(ammo_balloony)	{ spawnfunc_item_rockets(this);			}
-spawnfunc(ammo_bubbleg)		{ spawnfunc_item_rockets(this);			}
-spawnfunc(ammo_boaster)		{ spawnfunc_item_cells(this);			}
-spawnfunc(ammo_betty)		{ spawnfunc_item_rockets(this);			}
-spawnfunc(ammo_imperius)	{ spawnfunc_item_cells(this);			}
-
-spawnfunc(item_padpower)	{ spawnfunc_item_quad(this);			}
-spawnfunc(item_climber)		{ spawnfunc_item_invincible(this);		}
+//spawnfunc(item_revival)     /* handled by buffs mutator */
+//spawnfunc(item_jumper)      /* handled by buffs mutator */
+
+SPAWNFUNC_WEAPON(weapon_punchy, WEP_ARC)
+SPAWNFUNC_WEAPON(weapon_nipper, WEP_MACHINEGUN)
+SPAWNFUNC_WEAPON(weapon_pumper, WEP_SHOTGUN)
+SPAWNFUNC_WEAPON(weapon_boaster, WEP_ELECTRO)
+SPAWNFUNC_WEAPON(weapon_splasher, WEP_VORTEX)
+SPAWNFUNC_WEAPON(weapon_bubbleg, WEP_HAGAR)
+SPAWNFUNC_WEAPON(weapon_balloony, WEP_MORTAR)
+SPAWNFUNC_WEAPON(weapon_betty, WEP_DEVASTATOR)
+SPAWNFUNC_WEAPON(weapon_imperius, WEP_CRYLINK)
+
+SPAWNFUNC_ITEM(ammo_pumper, ITEM_Shells)
+SPAWNFUNC_ITEM(ammo_nipper, ITEM_Bullets)
+SPAWNFUNC_ITEM(ammo_balloony, ITEM_Rockets)
+SPAWNFUNC_ITEM(ammo_bubbleg, ITEM_Rockets)
+SPAWNFUNC_ITEM(ammo_boaster, ITEM_Cells)
+SPAWNFUNC_ITEM(ammo_betty, ITEM_Rockets)
+SPAWNFUNC_ITEM(ammo_imperius, ITEM_Cells)
+
+SPAWNFUNC_ITEM(item_padpower, ITEM_Strength)
+SPAWNFUNC_ITEM(item_climber, ITEM_Shield)
 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_ITEM(item_armor_padshield, ITEM_ArmorMega)
+
+SPAWNFUNC_ITEM(holdable_floater, ITEM_Jetpack)