Merge branch 'master' into terencehill/vec2_optimizations

diff --combined qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
index 0e8262249517fb2ce6149f99eef6209d1cee7c4f,d72efd137862c62b44949759c9ce043bbdd1d74e..223a81f7c4d4dfb6039a3ea6b2189b0df864dfd0
--- 1/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
--- 2/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
@@@ -143,8 -143,8 +143,8 @@@ void onslaught_updatelinks(
        {
                l.islinked = false;
                l.isshielded = true;
-               int i;
-               for(i = 0; i < 17; ++i) { l.isgenneighbor[i] = false; l.iscpneighbor[i] = false; }
+               l.aregensneighbor = 0;
+               l.arecpsneighbor = 0;
                LOG_DEBUG(etos(l), " (point) belongs to team ", ftos(l.team));
                l.sprite.SendFlags |= 16;
        }
@@@ -188,9 -188,9 +188,9 @@@
                                l.enemy.isshielded = false;
                        }
                        if(l.goalentity.classname == "onslaught_generator")
-                               l.enemy.isgenneighbor[l.goalentity.team] = true;
+                               l.enemy.aregensneighbor |= BIT(l.goalentity.team);
                        else
-                               l.enemy.iscpneighbor[l.goalentity.team] = true;
+                               l.enemy.arecpsneighbor |= BIT(l.goalentity.team);
                }
                if (l.enemy.islinked)
                {
@@@ -200,9 -200,9 +200,9 @@@
                                l.goalentity.isshielded = false;
                        }
                        if(l.enemy.classname == "onslaught_generator")
-                               l.goalentity.isgenneighbor[l.enemy.team] = true;
+                               l.goalentity.aregensneighbor |= BIT(l.enemy.team);
                        else
-                               l.goalentity.iscpneighbor[l.enemy.team] = true;
+                               l.goalentity.arecpsneighbor |= BIT(l.enemy.team);
                }
        }
        // now update the generators
@@@ -328,8 -328,8 +328,8 @@@ void ons_DelayedLinkSetup(entity this
  
  int ons_ControlPoint_CanBeLinked(entity cp, int teamnumber)
  {
-       if(cp.isgenneighbor[teamnumber]) { return 2; }
-       if(cp.iscpneighbor[teamnumber]) { return 1; }
+       if(cp.aregensneighbor & BIT(teamnumber)) return 2;
+       if(cp.arecpsneighbor & BIT(teamnumber)) return 1;
  
        return 0;
  }
@@@ -841,7 -841,7 +841,7 @@@ void ons_camSetup(entity this
        float best_trace_fraction = 0;
        while(ang.y < 360)
        {
 -              dir = eX * cos(ang.y * DEG2RAD) + eY * sin(ang.y * DEG2RAD);
 +              dir = vec2(cos(ang.y * DEG2RAD), sin(ang.y * DEG2RAD));
                dir *= 500;
                traceline(this.origin, this.origin - dir, MOVE_WORLDONLY, this);
                if(trace_fraction > best_trace_fraction)
@@@ -1308,7 -1308,7 +1308,7 @@@ void havocbot_goalrating_ons_controlpoi
                        continue;
  
                // Ignore owned controlpoints
-               if(!(cp2.isgenneighbor[this.team] || cp2.iscpneighbor[this.team]))
+               if(!((cp2.aregensneighbor & BIT(this.team)) || (cp2.arecpsneighbor & BIT(this.team))))
                        continue;
  
                // Count team mates interested in this control point