Skip to content

Commit 543c7f2

Browse files
authored
Merge pull request #5144 from MjnMixael/fix_weapon_origin
If we're not drawing weapon models then skip all this
2 parents ed14e03 + fe787ad commit 543c7f2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

code/ship/ship.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12253,7 +12253,7 @@ int ship_fire_primary(object * obj, int force, bool rollback_shot)
1225312253

1225412254
for ( w = 0; w < numtimes; w++ ) {
1225512255
polymodel *weapon_model = NULL;
12256-
if(winfo_p->external_model_num >= 0)
12256+
if (sip->draw_primary_models[bank_to_fire] && (winfo_p->external_model_num >= 0))
1225712257
weapon_model = model_get(winfo_p->external_model_num);
1225812258

1225912259
if (weapon_model)

0 commit comments

Comments
 (0)