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

Simplify bm_read_player_ship last_model_num handling

Browse source 
The existing handling always wrote to slot 0, but did so in a convoluted
way.  The variable names suggest this was not intended, but no one has
ever reported it as broken, and some otherwise valid data files may
depend on this quirk.
This commit is contained in:
Kp 2022-06-05 17:44:53 +00:00
parent 1b13274a5e
commit 504e950b75
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
similar/main/bmread.cpp
View file

@ -2024,7 +2024,6 @@ void bm_read_player_ship(void)
auto &Polygon_models = LevelSharedPolygonModelState.Polygon_models;
for (i=0;i<n_models;i++) {
int n_textures;
int last_model_num=0;
n_textures = first_bitmap_num[i+1] - first_bitmap_num[i];
const auto model_num = load_polygon_model(model_name[i], n_textures, first_bitmap_num[i], (i == 0) ? &ri : nullptr);
@ -2032,9 +2031,7 @@ void bm_read_player_ship(void)
if (i==0)
Player_ship->model_num = model_num;
else
Polygon_models[last_model_num].simpler_model = model_num+1;
last_model_num = model_num;
Polygon_models[0].simpler_model = model_num+1;
}
if ( model_name_dying ) {