From aeebffccc0a1a6e98f9451318a37e6ecc5a2c35a Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 5 Jun 2016 01:04:25 +0000 Subject: [PATCH] Rewrite cast of (ushort*) to standard type uint16_t s/(\s*ushort\s*\*\s*)/(uint16_t *)/g --- similar/main/morph.cpp | 6 +++--- similar/main/polyobj.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/similar/main/morph.cpp b/similar/main/morph.cpp index 3dece5fd4..32685eb04 100644 --- a/similar/main/morph.cpp +++ b/similar/main/morph.cpp @@ -87,7 +87,7 @@ static void find_min_max(polymodel *pm,int submodel_num,vms_vector &minv,vms_vec ushort nverts; ushort *data,type; - data = (ushort *) &pm->model_data[pm->submodel_ptrs[submodel_num]]; + data = (uint16_t *) &pm->model_data[pm->submodel_ptrs[submodel_num]]; type = *data++; @@ -122,7 +122,7 @@ static void init_points(polymodel *pm,const vms_vector *box_size,int submodel_nu ushort *data,type; int i; - data = (ushort *) &pm->model_data[pm->submodel_ptrs[submodel_num]]; + data = (uint16_t *) &pm->model_data[pm->submodel_ptrs[submodel_num]]; type = *data++; @@ -185,7 +185,7 @@ static void update_points(polymodel *pm,int submodel_num,morph_data *md) ushort *data,type; int i; - data = (ushort *) &pm->model_data[pm->submodel_ptrs[submodel_num]]; + data = (uint16_t *) &pm->model_data[pm->submodel_ptrs[submodel_num]]; type = *data++; diff --git a/similar/main/polyobj.cpp b/similar/main/polyobj.cpp index 831ab4e8f..9f8580b85 100644 --- a/similar/main/polyobj.cpp +++ b/similar/main/polyobj.cpp @@ -617,7 +617,7 @@ static void polyobj_find_min_max(polymodel *pm) auto &mx = pm->submodel_maxs[m]; const auto &ofs = pm->submodel_offsets[m]; - data = (ushort *)&pm->model_data[pm->submodel_ptrs[m]]; + data = (uint16_t *)&pm->model_data[pm->submodel_ptrs[m]]; type = *data++;