Merge pull request #717 from jengelh/master

Syntax upgrades

Author: Lgt2x

Descent3/AImain.cpp

@@ -1745,7 +1745,7 @@ bool AIMoveTowardsPosition(object *obj, /*velocity *new_vel,*/ vector *pos, floa
 
   if (stop_at_end_point) {
     if (vm_VectorDistance(pos, &obj->pos) <= .2f) {
-      obj->mtype.phys_info.velocity = Zero_vector;
+      obj->mtype.phys_info.velocity = vector{};
       *f_moved = true;
       return true;
     }
@@ -1772,7 +1772,7 @@ bool AIMoveTowardsPosition(object *obj, /*velocity *new_vel,*/ vector *pos, floa
   if (*pos == obj->pos) {
     physics_info *phys_info = &obj->mtype.phys_info;
 
-    if (phys_info->velocity != Zero_vector) {
+    if (phys_info->velocity != vector{}) {
       vector vel_diff = -phys_info->velocity;
       scalar delta_vel = vm_NormalizeVector(&vel_diff);
       scalar max_delta_vel = Frametime * ai_info->max_delta_velocity * acc_scale;
@@ -1825,7 +1825,7 @@ bool move_relative_object_vec(object *obj, vector *vec, object *target, float ci
     normal_component = opposite_fvec * vm_Dot3Product(opposite_fvec, vec_to_plane);
     plane_component = vec_to_plane - normal_component;
 
-    if (plane_component == Zero_vector) {
+    if (plane_component == vector{}) {
       goal_dir = target->orient.rvec;
     } else {
       goal_dir = plane_component;
@@ -1914,7 +1914,7 @@ bool compute_dodge_dir(vector *movement_dir, object *obj, object *dodge_obj) {
 
   dodge_vec *= scale;
 
-  if (dodge_vec != Zero_vector && (obj->ai_info->dodge_till_time < Gametime ||
+  if (dodge_vec != vector{} && (obj->ai_info->dodge_till_time < Gametime ||
                                    dodge_vec.mag() > obj->ai_info->last_dodge_dir.mag())) {
     obj->ai_info->last_dodge_dir = dodge_vec;
   }
@@ -1953,7 +1953,7 @@ bool goal_do_avoid_walls(object *obj, vector *mdir) {
   int num_faces;
   float rad;
   int i;
-  vector awall_dir = Zero_vector;
+  vector awall_dir{};
   float closest_dist;
   vector pos;
   bool f_danger = false;
@@ -1973,7 +1973,7 @@ bool goal_do_avoid_walls(object *obj, vector *mdir) {
 
   closest_dist = rad + 1.0f;
 
-  if (obj->mtype.phys_info.velocity == Zero_vector) {
+  if (obj->mtype.phys_info.velocity == vector{}) {
     return false;
   }
 
@@ -2115,7 +2115,7 @@ void AITurnTowardsDir(object *obj, /*velocity *new_vel,*/ vector *goal_dir /*, b
   matrix saved_orient = obj->orient;
   vector saved_uvec = obj->orient.uvec;
 
-  if (*goal_dir == Zero_vector || vm_Dot3Product(obj->orient.fvec, (*goal_dir)) >= ONE_DEGREE_ARC_COS)
+  if (*goal_dir == vector{} || vm_Dot3Product(obj->orient.fvec, (*goal_dir)) >= ONE_DEGREE_ARC_COS)
     return; // No goal_dir or less than 1 degree off goal
 
   if (obj->size > 32.0f && (vm_Dot3Product(obj->orient.fvec, (*goal_dir))) >= FIVE_DEGREE_ARC_COS)
@@ -2318,7 +2318,7 @@ bool MeleeHitOk(object *obj) {
     if (target->movement_type == MT_PHYSICS || target->movement_type == MT_PHYSICS) {
       relative_vel = -target->mtype.phys_info.velocity;
     } else {
-      relative_vel = Zero_vector;
+      relative_vel = vector{};
     }
   }
 
@@ -3685,7 +3685,7 @@ bool AIInit(object *obj, uint8_t ai_class, uint8_t ai_type, uint8_t ai_movement)
 
   ai_info->vec_to_target_perceived = obj->orient.fvec;
 
-  ai_info->last_dodge_dir = Zero_vector;
+  ai_info->last_dodge_dir = vector{};
   ai_info->dodge_till_time = Gametime - 1.0f;
 
   if (ObjGet(obj->parent_handle)) {
@@ -4081,7 +4081,7 @@ bool AiGoalAvoid(vector *adir, object *obj, object *a_obj, float dist) {
   if (a_obj->movement_type == MT_PHYSICS || a_obj->movement_type == MT_WALKING)
     a_vel = a_obj->mtype.phys_info.velocity;
   else
-    a_vel = Zero_vector;
+    a_vel = vector{};
 
   vector to_avoid = a_obj->pos - obj->pos;
   vector mdir;
@@ -4546,11 +4546,11 @@ void ai_move(object *obj) {
   // object *g_objs[5]; // 1 target + 2 enemies + 2 friends
 
   object *targetptr = ObjGet(ai_info->target_handle); // The target of this AI
-  ai_info->movement_dir = Zero_vector;
+  ai_info->movement_dir = vector{};
 
   // Hacked flocking code
   if (ai_info->ai_type == AIT_BIRD_FLOCK1) {
-    vector composite_dir = Zero_vector;
+    vector composite_dir{};
 
     for (int temp = 0; temp < AI_FriendNumNear; temp++) {
       object *g_obj = AI_FriendObj[temp];
@@ -4565,7 +4565,7 @@ void ai_move(object *obj) {
     }
 
     // Facing code
-    if (composite_dir == Zero_vector)
+    if (composite_dir == vector{})
       composite_dir = obj->orient.fvec;
 
     // FLOCK HEIGHT CODE
@@ -4601,8 +4601,8 @@ void ai_move(object *obj) {
   // Stop objects that have not been active lately
   if (!(ai_info->flags & AIF_PERSISTANT) && Gametime - ai_info->last_see_target_time > CHECK_VIS_INFREQUENTLY_TIME &&
       Gametime - ai_info->last_hear_target_time > CHECK_VIS_INFREQUENTLY_TIME && ai_info->awareness == AWARE_NONE) {
-    obj->mtype.phys_info.velocity = Zero_vector;
-    obj->mtype.phys_info.rotvel = Zero_vector;
+    obj->mtype.phys_info.velocity = vector{};
+    obj->mtype.phys_info.rotvel = vector{};
   } else {
     // Determine movement stuff
     if (obj->movement_type == MT_PHYSICS || obj->movement_type == MT_WALKING) {
@@ -5004,7 +5004,7 @@ void ai_move(object *obj) {
                 int16_t robots[6];
                 int num_robots =
                     fvi_QuickDistObjectList(&obj->pos, obj->roomnum, 30.0f, robots, 6, false, true, false, true);
-                vector d = Zero_vector;
+                vector d{};
                 int i;
                 float closest = 100000.0f;
 
@@ -5031,7 +5031,7 @@ void ai_move(object *obj) {
                   }
                 }
 
-                if (d != Zero_vector) {
+                if (d != vector{}) {
                   if (closest < 30.0f) {
                     float scale = 1.0f - closest / 30.0f;
                     vm_NormalizeVector(&d);
@@ -5065,16 +5065,16 @@ void ai_move(object *obj) {
           }
         } else {
           if (!(f_dodge || f_avoid ||
-                (ai_info->dodge_till_time >= Gametime && ai_info->last_dodge_dir != Zero_vector))) {
+                (ai_info->dodge_till_time >= Gametime && ai_info->last_dodge_dir != vector{}))) {
             AIMoveTowardsPosition(obj, &obj->pos, 1.0f, false, &goal_mdir, &goal_f_moved);
             goal_mset = true;
           }
         }
 
         // BLEND THIS!
-        if ((f_dodge || f_avoid || (ai_info->dodge_till_time >= Gametime && ai_info->last_dodge_dir != Zero_vector)) ||
+        if ((f_dodge || f_avoid || (ai_info->dodge_till_time >= Gametime && ai_info->last_dodge_dir != vector{})) ||
             (!goal_f_moved && goal_mset)) {
-          if (!f_dodge && (ai_info->dodge_till_time >= Gametime && ai_info->last_dodge_dir != Zero_vector)) {
+          if (!f_dodge && (ai_info->dodge_till_time >= Gametime && ai_info->last_dodge_dir != vector{})) {
             f_dodge = true;
             ai_info->movement_dir += ai_info->last_dodge_dir;
 
@@ -5550,7 +5550,7 @@ static inline void ai_walker_stuff(object *obj) {
         }
       }
 
-      obj->mtype.phys_info.velocity = Zero_vector;
+      obj->mtype.phys_info.velocity = vector{};
     }
   } else if (ai_info->movement_type == MC_WALKING) {
     int next_anim;
@@ -6028,8 +6028,8 @@ void AIDoFrame(object *obj) {
 
   // AI objects don't use thrust (in general)
   obj->mtype.phys_info.flags &= ~PF_USES_THRUST;
-  obj->mtype.phys_info.rotthrust = Zero_vector;
-  obj->mtype.phys_info.thrust = Zero_vector;
+  obj->mtype.phys_info.rotthrust = vector{};
+  obj->mtype.phys_info.thrust = vector{};
 
   if (obj->type == OBJ_DUMMY)
     return;
@@ -6145,7 +6145,7 @@ void AIDoFrame(object *obj) {
         if (speed > 0.1f && speed <= ai_info->max_velocity * 2.0) {
           if (obj->mtype.phys_info.drag > 0.0f && obj->mtype.phys_info.mass > 0.0f) {
             obj->mtype.phys_info.flags |= PF_USES_THRUST;
-            obj->mtype.phys_info.rotthrust = Zero_vector;
+            obj->mtype.phys_info.rotthrust = vector{};
             obj->mtype.phys_info.thrust = obj->mtype.phys_info.velocity * obj->mtype.phys_info.drag;
           }
         }

Descent3/ConfigItem.cpp

@@ -687,8 +687,8 @@ void ConfigItem::Add(int count, ...) {
       // make sure allocation ok
       ASSERT(m_tiList[i]);
       uitemp = va_arg(marker, UITextItem *);
-      (*m_tiList[i]) = *uitemp;
-      (*m_tiList[i]).set_alpha(255);
+      *m_tiList[i] = *uitemp;
+      m_tiList[i]->set_alpha(255);
       // allocate radio button
       m_rbList[i] = new UIRadioButton;
       // make sure allocation ok
@@ -700,11 +700,11 @@ void ConfigItem::Add(int count, ...) {
         m_rbList[i]->Create(m_hWnd, NULL, m_iID[i], m_tiList[i], m_X + curr_x, m_Y + curr_y, m_tiList[i]->width(),
                             m_tiList[i]->height(), UIF_FIT | UIRB_NOBUTTON);
 
-      (*m_tiList[i]).set_color(UICOL_HOTSPOT_HI);
+      m_tiList[i]->set_color(UICOL_HOTSPOT_HI);
       m_rbList[i]->SetStateItem(UI_BTS_ACTIVATED, m_tiList[i]);
-      (*m_tiList[i]).set_color(UICOL_HOTSPOT_LO);
+      m_tiList[i]->set_color(UICOL_HOTSPOT_LO);
       m_rbList[i]->SetStateItem(UI_BTS_INACTIVE, m_tiList[i]);
-      (*m_tiList[i]).set_color(UICOL_HOTSPOT_HI);
+      m_tiList[i]->set_color(UICOL_HOTSPOT_HI);
       m_rbList[i]->SetStateItem(UI_BTS_HILITE, m_tiList[i]);
 
       // adjust curr x/y

Descent3/Player.cpp

@@ -2640,7 +2640,7 @@ void PlayerSetControlToAI(int slot, float velocity) {
   pobj->ai_info->last_render_time = -1.0f;
   pobj->ai_info->next_target_update_time = Gametime;
   pobj->ai_info->notify_flags |= AI_NOTIFIES_ALWAYS_ON;
-  pobj->ai_info->last_see_target_pos = Zero_vector;
+  pobj->ai_info->last_see_target_pos = vector{};
   pobj->ai_info->dodge_vel_percent = 1.0f;
   pobj->ai_info->attack_vel_percent = 1.0f;
   pobj->ai_info->fight_same = 0.0f;

Descent3/SLEW.cpp

@@ -479,7 +479,7 @@ int SlewFrame(object *obj, int movement_limitations) {
   }
 
   // Set flag if rotation changed
-  if (rotang != angvec::ne())
+  if (rotang != angvec{})
     ret_flags |= SLEW_ROTATE;
 
   return ret_flags;

Descent3/TelCom.cpp

@@ -3697,7 +3697,7 @@ void TCSSSCallback(void) {
     return;
   }
 
-  vector viewer_eye = vector::ne();
+  vector viewer_eye{};
   matrix viewer_orient = IDENTITY_MATRIX;
   viewer_eye.z() = -TCShipSelect.cam_dist;
 

Descent3/WeaponFire.cpp

@@ -1309,7 +1309,7 @@ int CreateAndFireWeapon(vector *pos, vector *dir, object *parent, int weapon_num
     if (fdot > 0.0)
       fvel = parent->orient.fvec * fdot;
     else
-      fvel = Zero_vector;
+      fvel = vector{};
 
     vector rvel = 0.1f * parent->orient.rvec * vm_Dot3Product(parent->mtype.phys_info.velocity, parent->orient.rvec);
     vector uvel = 0.1f * parent->orient.uvec * vm_Dot3Product(parent->mtype.phys_info.velocity, parent->orient.uvec);
@@ -1373,7 +1373,7 @@ int CreateAndFireWeapon(vector *pos, vector *dir, object *parent, int weapon_num
 // Steers a homing missile
 void HomingTurnTowardObj(object *weapon, object *target) {
   vector dir_to_target;
-  vector movement = Zero_vector;
+  vector movement{};
 
   if (target == NULL)
     return;
@@ -1613,7 +1613,7 @@ object *HomingAquireTarget(object *obj) {
 
 // Does homing code
 void HomingDoFrame(object *obj) {
-  obj->mtype.phys_info.rotthrust = Zero_vector;
+  obj->mtype.phys_info.rotthrust = vector{};
 
   HomingTurnTowardObj(obj, HomingAquireTarget(obj));
 }
@@ -1840,7 +1840,7 @@ int FireWeaponFromObject(object *obj, int weapon_num, int gun_num, bool f_force_
       if (f_force_forward) {
         WeaponCalcGun(&laser_pos, NULL, obj, gun_num);
         laser_dir = obj->orient.fvec;
-      } else if (f_force_target && obj->ai_info && obj->ai_info->vec_to_target_perceived != Zero_vector) {
+      } else if (f_force_target && obj->ai_info && obj->ai_info->vec_to_target_perceived != vector{}) {
         WeaponCalcGun(&laser_pos, NULL, obj, gun_num);
         laser_dir = obj->ai_info->vec_to_target_perceived;
       } else {
@@ -2301,7 +2301,7 @@ void DoSprayEffect(object *obj, otype_wb_info *static_wb, uint8_t wb_index) {
         if (fdot > (scalar)0.0)
           fvel = obj->orient.fvec * fdot;
         else
-          fvel = Zero_vector;
+          fvel = vector{};
 
         vector rvel = (scalar)0.1f * obj->orient.rvec * vm_Dot3Product(obj->mtype.phys_info.velocity, obj->orient.rvec);
         vector uvel = (scalar)0.1f * obj->orient.uvec * vm_Dot3Product(obj->mtype.phys_info.velocity, obj->orient.uvec);
@@ -3355,7 +3355,7 @@ void TimeoutWeapon(object *obj) {
 
   if ((Weapons[n].flags & WF_MATTER_WEAPON) && !(Weapons[n].flags & WF_SPAWNS_TIMEOUT) &&
       (Weapons[n].spawn_count <= 0)) {
-    vector temp = Zero_vector;
+    vector temp{};
 
     if (Weapons[obj->id].sounds[WSI_IMPACT_WALL] != SOUND_NONE_INDEX)
       Sound_system.Play3dSound(Weapons[obj->id].sounds[WSI_IMPACT_WALL], SND_PRIORITY_HIGH, obj);

Descent3/damage.cpp

@@ -1092,7 +1092,7 @@ void SetFallingPhysics(object *objp) {
 
   // Special stuff for walkers
   if (objp->movement_type == MT_WALKING) {
-    objp->mtype.phys_info.rotvel = Zero_vector;
+    objp->mtype.phys_info.rotvel = vector{};
     objp->mtype.phys_info.flags |= PF_POINT_COLLIDE_WALLS;
     scalar proj = vm_Dot3Product(objp->mtype.phys_info.velocity, objp->orient.uvec);
     if (proj < 0.0f)

Descent3/demofile.cpp

@@ -518,7 +518,7 @@ void DemoWriteChangedObjects() {
       if ((Objects[i].type == OBJ_PLAYER) || (Objects[i].type == OBJ_OBSERVER) || (Objects[i].type == OBJ_ROBOT) ||
           (Objects[i].type == OBJ_POWERUP) || (Objects[i].type == OBJ_CLUTTER) || (Objects[i].type == OBJ_BUILDING) ||
           (Objects[i].type == OBJ_CAMERA)) {
-        if ((Objects[i].flags & OF_MOVED_THIS_FRAME)) //||(Objects[i].mtype.phys_info.velocity!=Zero_vector))
+        if ((Objects[i].flags & OF_MOVED_THIS_FRAME)) //||(Objects[i].mtype.phys_info.velocity!=vector{}))
         {
           DemoWriteChangedObj(&Objects[i]);
           // num_changed++;
@@ -923,8 +923,8 @@ void DemoReadObj() {
   // if((!((obj->flags&OF_DYING)||(obj->flags&OF_EXPLODING)||(obj->flags&OF_DEAD)))&&obj->type!=255)
 
   if (obj->type != OBJ_NONE) {
-    obj->mtype.phys_info.velocity = Zero_vector;
-    obj->mtype.phys_info.rotvel = Zero_vector;
+    obj->mtype.phys_info.velocity = vector{};
+    obj->mtype.phys_info.rotvel = vector{};
     ObjSetPos(obj, &pos, roomnum, &orient, true);
     poly_model *pm = &Poly_models[obj->rtype.pobj_info.model_num];
     if ((!(obj->flags & OF_ATTACHED)) && (pm->n_attach))
@@ -990,7 +990,7 @@ void DemoReadWeaponFire() {
   weapobjnum = cf_ReadShort(Demo_cfp);
   int16_t gunnum = cf_ReadShort(Demo_cfp);
   ASSERT(uniqueid != 0xffffffff);
-  ASSERT(dir != Zero_vector);
+  ASSERT(dir != vector{});
 
   // This is a hack for the napalm, omega & vauss to prevent making files incompatible
   if ((obj->type == OBJ_PLAYER) && (obj->id != Player_num)) {

Descent3/gamecinematics.cpp

@@ -714,7 +714,7 @@ bool Cinematic_StartCine(tGameCinematic *info, const char *text_string, int came
   camera->ai_info->last_render_time = -1.0f;
   camera->ai_info->next_target_update_time = Gametime;
   camera->ai_info->notify_flags |= AI_NOTIFIES_ALWAYS_ON;
-  camera->ai_info->last_see_target_pos = Zero_vector;
+  camera->ai_info->last_see_target_pos = vector{};
   camera->ai_info->dodge_vel_percent = 1.0f;
   camera->ai_info->attack_vel_percent = 1.0f;
   camera->ai_info->fight_same = 0.0f;
@@ -836,7 +836,7 @@ bool Cinematic_StartCine(tGameCinematic *info, const char *text_string, int came
       vector turn_to = target->pos - camera->pos;
       vm_NormalizeVector(&turn_to);
 
-      if (turn_to == Zero_vector) {
+      if (turn_to == vector{}) {
         LOG_WARNING << "Cine: No turn_to or less than 1 degree off goal";
         goto continue_start;
       }
@@ -1113,7 +1113,7 @@ void Cinematic_Frame(void) {
     vector turn_to = target->pos - camera->pos;
     vm_NormalizeVector(&turn_to);
 
-    if (turn_to == Zero_vector) {
+    if (turn_to == vector{}) {
       LOG_WARNING << "Cine: No turn_to or less than 1 degree off goal";
       goto continue_frame;
     }

Descent3/matcen.cpp

@@ -239,7 +239,7 @@ matcen::matcen() {
 
   m_status = 0;
 
-  m_create_pnt = Zero_vector;
+  m_create_pnt = vector{};
   m_create_room = MATCEN_ERROR;
 
   m_cached_prod_index = -1;
@@ -567,7 +567,7 @@ bool matcen::ComputeCreatePnt() {
         int num_valid_faces = 0;
         room *rp = &Rooms[m_roomnum];
 
-        m_create_pnt = Zero_vector;
+        m_create_pnt = vector{};
 
         for (i = 0; i < m_num_spawn_pnts; i++) {
           if (m_spawn_pnt[i] >= 0 && m_spawn_pnt[i] < rp->num_faces) {
@@ -623,7 +623,7 @@ bool matcen::ComputeCreatePnt() {
         int i;
         int num_valid_gps = 0;
 
-        m_create_pnt = Zero_vector;
+        m_create_pnt = vector{};
 
         for (i = 0; i < m_num_spawn_pnts; i++) {
           if (WeaponCalcGun(&m_spawn_vec[num_valid_gps], &m_spawn_normal[num_valid_gps], master_obj, m_spawn_pnt[i])) {