Skip to content

Commit c9a45c9

Browse files
author
Goober5000
committed
come on, Travis, stop halting after a single warning
1 parent ddd3a7d commit c9a45c9

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

code/debris/debris.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,6 @@ int debris_check_collision(object *pdebris, object *other_obj, vec3d *hitpos, co
898898
mc.flags = MC_ONLY_SPHERE | MC_CHECK_SPHERELINE;
899899

900900
SCP_vector<int> submodel_vector;
901-
polymodel *pm;
902901
polymodel_instance *pmi;
903902

904903
if (model_collide(&mc)) {
@@ -914,7 +913,6 @@ int debris_check_collision(object *pdebris, object *other_obj, vec3d *hitpos, co
914913
model_get_rotating_submodel_list(&submodel_vector, heavy_obj);
915914

916915
// Get polymodel and turn off all rotating submodels, collide against only 1 at a time.
917-
pm = model_get(Ship_info[Ships[heavy_obj->instance].ship_info_index].model_num);
918916
pmi = model_get_instance(Ships[heavy_obj->instance].model_instance_num);
919917

920918
// turn off all rotating submodels and test for collision

code/object/collideshipship.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ int ship_ship_check_collision(collision_info_struct *ship_ship_hit_info, vec3d *
238238

239239
SCP_vector<int> submodel_vector;
240240
int valid_hit_occured = 0;
241-
polymodel *pm, *pm_light;
241+
polymodel *pm_light;
242242
polymodel_instance *pmi;
243243

244244
pm_light = model_get(Ship_info[light_shipp->ship_info_index].model_num);
@@ -258,7 +258,6 @@ int ship_ship_check_collision(collision_info_struct *ship_ship_hit_info, vec3d *
258258

259259
model_get_rotating_submodel_list(&submodel_vector, heavy_obj);
260260

261-
pm = model_get(Ship_info[heavy_shipp->ship_info_index].model_num);
262261
pmi = model_get_instance(heavy_shipp->model_instance_num);
263262

264263
// turn off all rotating submodels and test for collision

0 commit comments

Comments
 (0)