Merge branch 'master' into Lyberta/URS3

diff --combined qcsrc/server/miscfunctions.qc
index d6b761c41d69423bbdd862135d5d8f7592a951fe,1b631c4b77668f3533b7f88b94c434d3999d825f..7b008f463490a4dab3a9e48dc87029a148653078
--- 1/qcsrc/server/miscfunctions.qc
--- 2/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -199,14 -199,14 +199,14 @@@ string NearestLocation(vector p
  string AmmoNameFromWeaponentity(entity wpn)
  {
        string ammoitems = "batteries";
 -      switch((wpn.m_weapon).ammo_field)
 +      switch ((wpn.m_weapon).ammo_type)
        {
 -              case ammo_shells:  ammoitems = ITEM_Shells.m_name;      break;
 -              case ammo_nails:   ammoitems = ITEM_Bullets.m_name;     break;
 -              case ammo_rockets: ammoitems = ITEM_Rockets.m_name;     break;
 -              case ammo_cells:   ammoitems = ITEM_Cells.m_name;       break;
 -              case ammo_plasma:  ammoitems = ITEM_Plasma.m_name;      break;
 -              case ammo_fuel:    ammoitems = ITEM_JetpackFuel.m_name; break;
 +              case RESOURCE_SHELLS:  ammoitems = ITEM_Shells.m_name;      break;
 +              case RESOURCE_BULLETS: ammoitems = ITEM_Bullets.m_name;     break;
 +              case RESOURCE_ROCKETS: ammoitems = ITEM_Rockets.m_name;     break;
 +              case RESOURCE_CELLS:   ammoitems = ITEM_Cells.m_name;       break;
 +              case RESOURCE_PLASMA:  ammoitems = ITEM_Plasma.m_name;      break;
 +              case RESOURCE_FUEL:    ammoitems = ITEM_JetpackFuel.m_name; break;
        }
        return ammoitems;
  }
@@@ -933,24 -933,21 +933,21 @@@ void InitializeEntitiesRun(
  .float(entity) isEliminated;
  bool EliminatedPlayers_SendEntity(entity this, entity to, float sendflags)
  {
-       float i, f, b;
-       entity e;
-       WriteHeader(MSG_ENTITY, ENT_CLIENT_ELIMINATEDPLAYERS);
-       WriteByte(MSG_ENTITY, sendflags);
- 
-       if(sendflags & 1)
-       {
-               for(i = 1; i <= maxclients; i += 8)
-               {
-                       for(f = 0, e = edict_num(i), b = 1; b < 256; b *= 2, e = nextent(e))
-                       {
-                               if(eliminatedPlayers.isEliminated(e))
-                                       f |= b;
+       Stream out = MSG_ENTITY;
+       WriteHeader(out, ENT_CLIENT_ELIMINATEDPLAYERS);
+       serialize(byte, out, sendflags);
+       if (sendflags & 1) {
+               for (int i = 1; i <= maxclients; i += 8) {
+                   int f = 0;
+             entity e = edict_num(i);
+                       for (int b = 0; b < 8; ++b, e = nextent(e)) {
+                               if (eliminatedPlayers.isEliminated(e)) {
+                                       f |= BIT(b);
+                               }
                        }
-                       WriteByte(MSG_ENTITY, f);
+                       serialize(byte, out, f);
                }
        }
- 
        return true;
  }