TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use if constexpr to guard calls to align_polygon_model_data

Browse source 
This allows the compiler to see and perform basic checks on the call
even in builds with `DXX_WORDS_NEED_ALIGNMENT == 0`.

Also, fix a missing address-of operator in one invocation of
`align_polygon_model_data`.

Reported-by: Brunnis <https://github.com/dxx-rebirth/dxx-rebirth/issues/687> (missing address-of operator)
Fixes: 43e1c841f0 ("Pass polymodel& to polymodel_read")
This commit is contained in:
Kp 2022-12-31 16:21:47 +00:00
parent 9ba1c13d9f
commit e0478f8111
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
similar/main/polyobj.cpp
View file

@ -301,9 +301,8 @@ static void read_model_file(polymodel &pm, const char *const filename, robot_inf
pof_cfseek(model_buf,next_chunk,SEEK_SET);
}
#if DXX_WORDS_NEED_ALIGNMENT
align_polygon_model_data(pm);
#endif
if constexpr (DXX_WORDS_NEED_ALIGNMENT)
align_polygon_model_data(&pm);
if constexpr (words_bigendian)
swap_polygon_model_data(pm.model_data.get());
}
@ -647,13 +646,14 @@ void polygon_model_data_read(polymodel *pm, PHYSFS_File *fp)
auto model_data_size = pm->model_data_size;
pm->model_data = std::make_unique<uint8_t[]>(model_data_size);
PHYSFS_read(fp, pm->model_data, sizeof(uint8_t), model_data_size);
#if DXX_WORDS_NEED_ALIGNMENT
/* Aligning model data changes pm->model_data_size. Reload it
* afterward.
*/
align_polygon_model_data(pm);
model_data_size = pm->model_data_size;
#endif
if constexpr (DXX_WORDS_NEED_ALIGNMENT)
{
align_polygon_model_data(pm);
model_data_size = pm->model_data_size;
}
if constexpr (words_bigendian)
swap_polygon_model_data(pm->model_data.get());
#if defined(DXX_BUILD_DESCENT_I)