Merged Lyberta/GivePlayerAmmo into Lyberta/RandomStartWeapons.

diff --cc qcsrc/common/t_items.qc
index 4c0125afb687c923ac92e1fcd068232e03e19482,6ee7c1d8b656d436674a31bc1529139d34d9ae96..79552505ad961f0267958cc7533b3b7485e4662e
--- 1/qcsrc/common/t_items.qc
--- 2/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@@ -702,97 -749,17 +749,98 @@@ void GivePlayerAmmo(entity player, .flo
                        maxvalue = g_pickup_nails_max;
                        break;
                }
-               case ammo_fuel:
-               {
-                       maxvalue = g_pickup_fuel_max;
-                       break;
-               }
        }
-       player.(ammotype) = min(player.(ammotype) + amount, maxvalue);
+       player.(ammotype) = min(player.(ammotype) + amount,
+               min(maxvalue, ITEM_COUNT_HARD_LIMIT));
+ }
+ 
+ void GivePlayerFuel(entity player, float amount)
+ {
+       GivePlayerResource(player, ammo_fuel, amount);
  }
  
- float Item_GiveAmmoTo(entity item, entity player, .float ammotype, float ammomax, float mode)
 +void GivePlayerRandomWeapons(entity player, int num_weapons,
 +      string weapon_names, float shells, float bullets, float rockets,
 +      float cells, float plasma)
 +{
 +      if (num_weapons == 0)
 +      {
 +              return;
 +      }
 +      int num_potential_weapons = tokenize_console(weapon_names);
 +      for (int i = 0; i < num_weapons; ++i)
 +      {
 +              RandomSelection_Init();
 +              for (int j = 0; j < num_potential_weapons; ++j)
 +              {
 +                      string weapon = argv(j);
 +                      FOREACH(Weapons, it != WEP_Null,
 +                      {
 +                              // Finding a weapon which player doesn't have.
 +                              if (!(player.weapons & it.m_wepset) && (it.netname == weapon))
 +                              {
 +                                      RandomSelection_AddEnt(it, 1, 1);
 +                                      break;
 +                              }
 +                      });
 +              }
 +              if (RandomSelection_chosen_ent == NULL)
 +              {
 +                      return;
 +              }
 +              player.weapons |= RandomSelection_chosen_ent.m_wepset;
 +              switch (RandomSelection_chosen_ent.ammo_field)
 +              {
 +                      case (ammo_shells):
 +                      {
 +                              if (player.ammo_shells != 0)
 +                              {
 +                                      break;
 +                              }
 +                              GivePlayerAmmo(player, ammo_shells, shells);
 +                              break;
 +                      }
 +                      case (ammo_nails):
 +                      {
 +                              if (player.ammo_nails != 0)
 +                              {
 +                                      break;
 +                              }
 +                              GivePlayerAmmo(player, ammo_nails, bullets);
 +                              break;
 +                      }
 +                      case (ammo_rockets):
 +                      {
 +                              if (player.ammo_rockets != 0)
 +                              {
 +                                      break;
 +                              }
 +                              GivePlayerAmmo(player, ammo_rockets, rockets);
 +                              break;
 +                      }
 +                      case (ammo_cells):
 +                      {
 +                              if (player.ammo_cells != 0)
 +                              {
 +                                      break;
 +                              }
 +                              GivePlayerAmmo(player, ammo_cells, cells);
 +                              break;
 +                      }
 +                      case (ammo_plasma):
 +                      {
 +                              if (player.ammo_plasma != 0)
 +                              {
 +                                      break;
 +                              }
 +                              GivePlayerAmmo(player, ammo_plasma, plasma);
 +                              break;
 +                      }
 +              }
 +      }
 +}
 +
+ float Item_GiveAmmoTo(entity item, entity player, .float ammotype, float ammomax)
  {
        if (!item.(ammotype))
                return false;

diff --cc qcsrc/common/t_items.qh
index 009fc926a76529812238fe448e77ececd8acf959,14cbd8e3f4816fda3a608f921f07fdd2d9d3c9e1..af7d91758dd4afd0bbbfa69fc8fc155433f71609
--- 1/qcsrc/common/t_items.qh
--- 2/qcsrc/common/t_items.qh
+++ b/qcsrc/common/t_items.qh
@@@ -105,25 -115,13 +115,27 @@@ void GivePlayerArmor(entity player, flo
  /// \return No return.
  void GivePlayerAmmo(entity player, .float ammotype, float amount);
  
- float ITEM_MODE_NONE = 0;
- float ITEM_MODE_HEALTH = 1;
- float ITEM_MODE_ARMOR = 2;
- float ITEM_MODE_FUEL = 3;
- float Item_GiveAmmoTo(entity item, entity player, .float ammotype, float ammomax, float mode);
+ /// \brief Gives fuel to the player.
+ /// \param[in,out] player Player to give fuel to.
+ /// \param[in] amount Amount of fuel to give.
+ /// \return No return.
+ void GivePlayerFuel(entity player, float amount);
+ 
 +/// \brief Give several random weapons and ammo to the player.
 +/// \param[in,out] player Player to give weapons to.
 +/// \param[in] num_weapons Number of weapons to give.
 +/// \param[in] weapon_names Names of weapons to give separated by spaces.
 +/// \param[in] shells Amount of shells to give with shell-based weapon.
 +/// \param[in] bullets Amount of bullets to give with bullet-based weapon.
 +/// \param[in] rockets Amount of rockets to give with rocket-based weapon.
 +/// \param[in] cells Amount of cells to give with cell-based weapon.
 +/// \param[in] cells Amount of plasma to give with plasma-based weapon.
 +/// \return No return.
 +void GivePlayerRandomWeapons(entity player, int num_weapons,
 +      string weapon_names, float shells, float bullets, float rockets,
 +      float cells, float plasma);
 +
+ float Item_GiveAmmoTo(entity item, entity player, .float ammotype, float ammomax);
  
  float Item_GiveTo(entity item, entity player);
  

diff --cc qcsrc/server/client.qc
Simple merge