Merge branch 't0uYK8Ne/target_init' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / miscfunctions.qh

diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh
index 8dc3faa18ab26a68b6e63d75a84924ec4dff2e47..8a32b9b5bddf8c9ff71e031f6857fecbc86cb812 100644 (file)
--- a/qcsrc/server/miscfunctions.qh
+++ b/qcsrc/server/miscfunctions.qh
@@ -190,16 +190,11 @@ float start_ammo_plasma;
 float start_ammo_fuel;
 /// \brief Number of random start weapons to give to players.
 int random_start_weapons_count;
-/// \brief Amount of shells to give with a shell-based random start weapon.
-float random_start_shells;
-/// \brief Amount of bullets to give with a bullet-based random start weapon.
-float random_start_bullets;
-/// \brief Amount of rockets to give with a rocket-based random start weapon.
-float random_start_rockets;
-/// \brief Amount of cells to give with a cell-based random start weapon.
-float random_start_cells;
-/// \brief Amount of plasma to give with a plasma-based random start weapon.
-float random_start_plasma;
+/// \brief Holds a list of possible random start weapons.
+string autocvar_g_random_start_weapons;
+/// \brief Entity that contains amount of ammo to give with random start
+/// weapons.
+entity random_start_ammo;
 float start_health;
 float start_armorvalue;
 WepSet warmup_start_weapons;
@@ -240,6 +235,9 @@ void readlevelcvars()
        sv_maxidle_slots_countbots = cvar("sv_maxidle_slots_countbots");
        sv_autotaunt = cvar("sv_autotaunt");
        sv_taunt = cvar("sv_taunt");
+       sv_ready_restart = cvar("sv_ready_restart");
+       sv_ready_restart_after_countdown = cvar("sv_ready_restart_after_countdown");
+       sv_ready_restart_repeatable = cvar("sv_ready_restart_repeatable");
 
        warmup_stage = cvar("g_warmup");
        warmup_limit = cvar("g_warmup_limit");