Merge branch 'master' into TimePath/guide

# Conflicts:
#	qcsrc/Makefile
#	qcsrc/common/items/item/ammo.qc
#	qcsrc/common/items/item/jetpack.qc
#	qcsrc/common/items/item/powerup.qc

diff --cc qcsrc/common/items/item/armor.qc
Simple merge

diff --cc qcsrc/common/items/item/jetpack.qc
index fa286c93ece8ecf20c1ff149629bf491ad53742d,25dd9b131c2aadaeedf31117aebec7a63531bc06..856704dd840e4c4964a2b3867c7ce091ac83d931
--- 1/qcsrc/common/items/item/jetpack.qc
--- 2/qcsrc/common/items/item/jetpack.qc
+++ b/qcsrc/common/items/item/jetpack.qc
@@@ -3,30 -3,26 +3,27 @@@
      #include "../../../server/constants.qh"
  #endif
  
- REGISTER_ITEM(Jetpack, Pickup) {
+ #include "ammo.qh"
+ #include "powerup.qh"
+ 
+ REGISTER_ITEM(Jetpack, Powerup) {
      this.m_model                =   "models/items/g_jetpack.md3";
      this.m_name                 =   "Jet pack";
 +    this.m_icon                 =   "jetpack";
  #ifdef SVQC
      this.m_botvalue             =   BOT_PICKUP_RATING_LOW;
-     this.m_itemflags            =   FL_POWERUP;
      this.m_itemid               =   IT_JETPACK;
      this.m_pickupevalfunc       =   commodity_pickupevalfunc;
-     this.m_respawntime          =   GET(g_pickup_respawntime_powerup);
-     this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_powerup);
  #endif
  }
  
- REGISTER_ITEM(JetpackFuel, Pickup) {
-     this.m_model                =   "models/items/g_fuel.md3";
-     this.m_name                 =   "Fuel";
-     this.m_icon                 =   "ammo_fuel";
+ REGISTER_ITEM(JetpackFuel, Ammo) {
+     this.m_model    =   "models/items/g_fuel.md3";
+     this.m_name     =   "Fuel";
 -    this.m_ammoPic  =   "ammo_fuel";
++    this.m_icon     =   "ammo_fuel";
  #ifdef SVQC
-     this.m_botvalue             =   BOT_PICKUP_RATING_LOW;
-     this.m_itemid               =   IT_FUEL;
-     this.m_pickupevalfunc       =   commodity_pickupevalfunc;
-     this.m_respawntime          =   GET(g_pickup_respawntime_ammo);
-     this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_ammo);
+     this.m_botvalue =   BOT_PICKUP_RATING_LOW;
+     this.m_itemid   =   IT_FUEL;
  #endif
  }
  

diff --cc qcsrc/common/items/item/powerup.qc
index d1e017c6b8a0b6612a02515254e726eef9978768,c4bfb39361f2efffe7c97064ef6408748a1a713b..fe325821189cc2d682b27a3aaba974a9bc4c2431
--- 1/qcsrc/common/items/item/powerup.qc
--- 2/qcsrc/common/items/item/powerup.qc
+++ b/qcsrc/common/items/item/powerup.qc
@@@ -5,17 -8,11 +8,13 @@@ REGISTER_ITEM(Strength, Powerup) 
      this.m_model    =   "models/items/g_strength.md3";
      this.m_sound    =   "misc/powerup.wav";
      this.m_name     =   "Strength Powerup";
- #ifdef SVQC
 +    this.m_icon     =   "strength";
      this.m_itemid   =   IT_STRENGTH;
- #endif
  }
  REGISTER_ITEM(Shield, Powerup) {
      this.m_model    =   "models/items/g_invincible.md3";
      this.m_sound    =   "misc/powerup_shield.wav";
      this.m_name     =   "Shield";
- #ifdef SVQC
 +    this.m_icon     =   "shield";
      this.m_itemid   =   IT_INVINCIBLE;
- #endif
  }

diff --cc qcsrc/common/weapons/all.qc
index 72c92471a9c537435aaeb29ed20072303c7700a3,9f78f6454852d09e390a7e1b44839e3d48b167df..3f0d6a097820b0b9e9ab81fcdeb46b559688503a
--- 1/qcsrc/common/weapons/all.qc
--- 2/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@@ -353,14 -289,14 +289,14 @@@ void W_RandomWeapons(entity e, float n
  
  string GetAmmoPicture(.int ammotype)
  {
-       switch(ammotype)
+       switch (ammotype)
        {
-               case ammo_shells:  return "ammo_shells";
-               case ammo_nails:   return "ammo_bullets";
-               case ammo_rockets: return "ammo_rockets";
-               case ammo_cells:   return "ammo_cells";
-               case ammo_plasma:  return "ammo_cells";
-               case ammo_fuel:    return "ammo_fuel";
 -              case ammo_shells:  return ITEM_Shells.m_ammoPic;
 -              case ammo_nails:   return ITEM_Bullets.m_ammoPic;
 -              case ammo_rockets: return ITEM_Rockets.m_ammoPic;
 -              case ammo_cells:   return ITEM_Cells.m_ammoPic;
 -              case ammo_plasma:  return ITEM_Plasma.m_ammoPic;
 -              case ammo_fuel:    return ITEM_JetpackFuel.m_ammoPic;
++              case ammo_shells:  return ITEM_Shells.m_icon;
++              case ammo_nails:   return ITEM_Bullets.m_icon;
++              case ammo_rockets: return ITEM_Rockets.m_icon;
++              case ammo_cells:   return ITEM_Cells.m_icon;
++              case ammo_plasma:  return ITEM_Plasma.m_icon;
++              case ammo_fuel:    return ITEM_JetpackFuel.m_icon;
                default: return ""; // wtf, no ammo type?
        }
  }