Skip to content

Commit f76bf1b

Browse files
authored
Fix 'show-ship` not working (#6860)
Small one-line fix that follows up #6849. That PR removed the `!(Viewer_mode & VM_EXTERNAL))` check within a section of `ship_render_player_ship` to optimize insignia rendering, but turns out that check is needed to ensure `show-ship` properly works. This PR restores that check to fix this bug, and ideally the thoughts about slightly optimizing insignias can be considered later. Tested and works as expected.
1 parent 755c4c4 commit f76bf1b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

code/ship/ship.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8185,7 +8185,7 @@ void ship_render_player_ship(object* objp, const vec3d* cam_offset, const matrix
81858185
const bool renderShipModel = (
81868186
sip->flags[Ship::Info_Flags::Show_ship_model])
81878187
&& (!Show_ship_only_if_cockpits_enabled || Cockpit_active)
8188-
&& (!Viewer_mode || (Viewer_mode & VM_PADLOCK_ANY) || (Viewer_mode & VM_OTHER_SHIP) || (Viewer_mode & VM_TRACK));
8188+
&& (!Viewer_mode || (Viewer_mode & VM_PADLOCK_ANY) || (Viewer_mode & VM_OTHER_SHIP) || (Viewer_mode & VM_TRACK) || !(Viewer_mode & VM_EXTERNAL));
81898189
Cockpit_active = renderCockpitModel;
81908190

81918191
//Nothing to do

0 commit comments

Comments
 (0)