Merge branch 'Mario/cs_clientcvars' into 'master'

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

diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc
index 02bd04d5d6082d5f1824a1cdabd71a1324e85455..532428dd08893eb39a78c033b51850f43f3904dd 100644 (file)
--- a/qcsrc/server/compat/quake3.qc
+++ b/qcsrc/server/compat/quake3.qc
@@ -1,12 +1,16 @@
 #include "quake3.qh"
 
+#include <server/defs.qh>
+#include <server/miscfunctions.qh>
 #include <common/weapons/_all.qh>
 
 spawnfunc(weapon_crylink);
 spawnfunc(weapon_electro);
 spawnfunc(weapon_hagar);
+spawnfunc(weapon_hook);
 spawnfunc(weapon_machinegun);
 spawnfunc(weapon_vortex);
+spawnfunc(weapon_minelayer);
 
 spawnfunc(target_items);
 
@@ -15,7 +19,7 @@ spawnfunc(item_cells);
 spawnfunc(item_rockets);
 spawnfunc(item_shells);
 
-spawnfunc(item_jetpack);
+spawnfunc(item_strength);
 
 spawnfunc(item_armor_big);
 spawnfunc(item_armor_mega);
@@ -39,6 +43,10 @@ spawnfunc(ammo_bullets)        { spawnfunc_item_bullets(this);        }
 // GL -> Mortar
 spawnfunc(ammo_grenades)       { spawnfunc_item_rockets(this);        }
 
+// Mines -> Rockets
+spawnfunc(weapon_prox_launcher) { spawnfunc_weapon_minelayer(this);   }
+spawnfunc(ammo_mines)           { spawnfunc_item_rockets(this);       }
+
 // LG -> Lightning
 spawnfunc(weapon_lightning)    { spawnfunc_weapon_electro(this);      }
 spawnfunc(ammo_lightning)      { spawnfunc_item_cells(this);          }
@@ -48,24 +56,30 @@ spawnfunc(weapon_plasmagun)    { spawnfunc_weapon_hagar(this);        }
 spawnfunc(ammo_cells)          { spawnfunc_item_rockets(this);        }
 
 // Rail -> Vortex
-spawnfunc(weapon_railgun)      { spawnfunc_weapon_vortex(this);          }
+spawnfunc(weapon_railgun)      { spawnfunc_weapon_vortex(this);       }
 spawnfunc(ammo_slugs)          { spawnfunc_item_cells(this);          }
 
 // BFG -> Crylink
 spawnfunc(weapon_bfg)          { spawnfunc_weapon_crylink(this);      }
 spawnfunc(ammo_bfg)            { spawnfunc_item_cells(this);          }
 
+// grappling hook -> hook
+spawnfunc(weapon_grapplinghook) { spawnfunc_weapon_hook(this);        }
+
 // RL -> RL
 spawnfunc(ammo_rockets)        { spawnfunc_item_rockets(this);        }
 
 // Armor
-spawnfunc(item_armor_body)     { spawnfunc_item_armor_mega(this);    }
+spawnfunc(item_armor_body)     { spawnfunc_item_armor_mega(this);     }
 spawnfunc(item_armor_combat)   { spawnfunc_item_armor_big(this);      }
 spawnfunc(item_armor_shard)    { spawnfunc_item_armor_small(this);    }
 spawnfunc(item_enviro)         { spawnfunc_item_invincible(this);     }
 
 // medkit -> armor (we have no holdables)
-spawnfunc(holdable_medkit)        { spawnfunc_item_armor_mega(this);    }
+spawnfunc(holdable_medkit)        { spawnfunc_item_armor_mega(this);     }
+
+// doubler -> strength
+spawnfunc(item_doubler)        { spawnfunc_item_strength(this); }
 
 .float wait;
 .float delay;
@@ -143,6 +157,7 @@ void target_give_init(entity this)
         it.nextthink = time;
        });
        this.spawnflags = 2;
+       this.spawnfunc_checked = true;
        spawnfunc_target_items(this);
        InitializeEntity(this, target_init_verify, INITPRIO_FINDTARGET);
 }
@@ -152,7 +167,7 @@ spawnfunc(target_give)
        InitializeEntity(this, target_give_init, INITPRIO_FINDTARGET);
 }
 
-//spawnfunc(item_flight)       /* handled by jetpack */
+//spawnfunc(item_flight)       /* handled by buffs mutator */
 //spawnfunc(item_haste)        /* handled by buffs mutator */
 //spawnfunc(item_health)       /* handled in t_quake.qc */
 //spawnfunc(item_health_large) /* handled in t_items.qc */
@@ -163,11 +178,6 @@ spawnfunc(target_give)
 
 // CTF spawnfuncs handled in mutators/gamemode_ctf.qc now
 
-spawnfunc(item_flight)
-{
-       spawnfunc_item_jetpack(this);
-}
-
 .float notteam;
 .float notsingle;
 .float notfree;