Renamed num_random_start_weapons to random_start_weapons_count.

diff --git a/balance-mario.cfg b/balance-mario.cfg
index eabbff57773e40081b8130a5cad68e14e03588bc..79617880b8efe86598f799fd09402daa662be54f 100644 (file)
--- a/balance-mario.cfg
+++ b/balance-mario.cfg
@@ -9,7 +9,7 @@ set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
 set g_start_ammo_plasma 0
 set g_start_ammo_fuel 0
-set g_num_random_start_weapons 0
+set g_random_start_weapons_count 0
 set g_random_start_weapons "machinegun mortar electro crylink vortex hagar devastator"
 set g_random_start_shells 15
 set g_random_start_bullets 80

diff --git a/balance-nexuiz25.cfg b/balance-nexuiz25.cfg
index b31df84a6a3bd54d3aa7e717f1252025dac5e5f3..37099c1226dfa6ff992a97b74ef1217b91111b31 100644 (file)
--- a/balance-nexuiz25.cfg
+++ b/balance-nexuiz25.cfg
@@ -9,7 +9,7 @@ set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
 set g_start_ammo_plasma 0
 set g_start_ammo_fuel 0
-set g_num_random_start_weapons 0
+set g_random_start_weapons_count 0
 set g_random_start_weapons "machinegun mortar electro crylink vortex hagar devastator"
 set g_random_start_shells 15
 set g_random_start_bullets 80

diff --git a/balance-overkill.cfg b/balance-overkill.cfg
index eb9fe4fd43a4f6678481889af262ba84a4dcaca2..e64a19e5f4e25fa90645b4c8146a0e60e42f2a92 100644 (file)
--- a/balance-overkill.cfg
+++ b/balance-overkill.cfg
@@ -9,7 +9,7 @@ set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
 set g_start_ammo_plasma 0
 set g_start_ammo_fuel 0
-set g_num_random_start_weapons 0
+set g_random_start_weapons_count 0
 set g_random_start_weapons "machinegun mortar electro crylink vortex hagar devastator"
 set g_random_start_shells 15
 set g_random_start_bullets 80

diff --git a/balance-samual.cfg b/balance-samual.cfg
index f1d81cab1d06d42ec31bae9e7dfbe97b229ff029..4b579f0fd8b460ff687fb854555d2dc6ab27f7c2 100644 (file)
--- a/balance-samual.cfg
+++ b/balance-samual.cfg
@@ -9,7 +9,7 @@ set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
 set g_start_ammo_plasma 0
 set g_start_ammo_fuel 0
-set g_num_random_start_weapons 0
+set g_random_start_weapons_count 0
 set g_random_start_weapons "machinegun mortar electro crylink vortex hagar devastator"
 set g_random_start_shells 15
 set g_random_start_bullets 80

diff --git a/balance-xdf.cfg b/balance-xdf.cfg
index 87643b8b2e08e08d3d86d97349b99d9c14e04bae..66a92403d79c0878e6a4d3c450cf8d9921d477a0 100644 (file)
--- a/balance-xdf.cfg
+++ b/balance-xdf.cfg
@@ -9,7 +9,7 @@ set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
 set g_start_ammo_plasma 0
 set g_start_ammo_fuel 0
-set g_num_random_start_weapons 0
+set g_random_start_weapons_count 0
 set g_random_start_weapons "machinegun mortar electro crylink vortex hagar devastator"
 set g_random_start_shells 15
 set g_random_start_bullets 80

diff --git a/balance-xonotic.cfg b/balance-xonotic.cfg
index 02b928c90b661494f3481f644d76a712046bb1bc..a1fd084e6c98bd575da77985c21af44b2bde63c8 100644 (file)
--- a/balance-xonotic.cfg
+++ b/balance-xonotic.cfg
@@ -9,7 +9,7 @@ set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
 set g_start_ammo_plasma 0
 set g_start_ammo_fuel 0
-set g_num_random_start_weapons 0
+set g_random_start_weapons_count 0
 set g_random_start_weapons "machinegun mortar electro crylink vortex hagar devastator"
 set g_random_start_shells 15
 set g_random_start_bullets 80

diff --git a/balance-xpm.cfg b/balance-xpm.cfg
index 9731f7ee0a6058596d960b63f43ce356fe581484..4b3cfb91d2fe5fe7dbaa007ff3b32a13b0085c17 100644 (file)
--- a/balance-xpm.cfg
+++ b/balance-xpm.cfg
@@ -9,7 +9,7 @@ set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
 set g_start_ammo_plasma 0
 set g_start_ammo_fuel 0
-set g_num_random_start_weapons 0
+set g_random_start_weapons_count 0
 set g_random_start_weapons "machinegun mortar electro crylink vortex hagar devastator"
 set g_random_start_shells 15
 set g_random_start_bullets 80

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 43fd0be913da0d1a49efec3a54ece028ca430fdf..5cc8349acc6cb2fbec530d16d368d92386ab1dab 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -546,7 +546,7 @@ void PutPlayerInServer(entity this)
                this.health = start_health;
                this.armorvalue = start_armorvalue;
                this.weapons = start_weapons;
-               GivePlayerRandomWeapons(this, num_random_start_weapons,
+               GivePlayerRandomWeapons(this, random_start_weapons_count,
                        cvar_string("g_random_start_weapons"), random_start_shells,
                        random_start_bullets, random_start_rockets, random_start_cells,
                        random_start_plasma);

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 1abcf850c46e44219a90e223394e023adbf0c583..62be9cbbe1701e9a20c455b978582caac75fad58 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -643,7 +643,7 @@ void readplayerstartcvars()
                start_ammo_cells = cvar("g_start_ammo_cells");
                start_ammo_plasma = cvar("g_start_ammo_plasma");
                start_ammo_fuel = cvar("g_start_ammo_fuel");
-               num_random_start_weapons = cvar("g_num_random_start_weapons");
+               random_start_weapons_count = cvar("g_random_start_weapons_count");
                random_start_shells = cvar("g_random_start_shells");
                random_start_bullets = cvar("g_random_start_bullets");
                random_start_rockets = cvar("g_random_start_rockets");

diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh
index 23a5778e0c2ef2a65b427f0d72413bb725a5568f..8dc3faa18ab26a68b6e63d75a84924ec4dff2e47 100644 (file)
--- a/qcsrc/server/miscfunctions.qh
+++ b/qcsrc/server/miscfunctions.qh
@@ -188,11 +188,17 @@ float start_ammo_rockets;
 float start_ammo_cells;
 float start_ammo_plasma;
 float start_ammo_fuel;
-int num_random_start_weapons;
+/// \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;
 float start_health;
 float start_armorvalue;