Ensure hand is drawn if dual sabering, but holding a different weapon

This commit is contained in:
Simon 2023-03-12 10:58:23 +00:00
parent a67dc074cb
commit 7528b8dc40

View file

@ -2345,7 +2345,9 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView ) {
if (!in_camera if (!in_camera
&& !cg.renderingThirdPerson && !cg.renderingThirdPerson
&& cg.predicted_player_state.stats[STAT_HEALTH] > 0 && cg.predicted_player_state.stats[STAT_HEALTH] > 0
&& (cg.snap->ps.viewEntity < ENTITYNUM_WORLD && g_entities[cg.snap->ps.viewEntity].client && !g_entities[cg.snap->ps.viewEntity].client->ps.dualSabers) && cg.snap->ps.viewEntity < ENTITYNUM_WORLD
&& g_entities[cg.snap->ps.viewEntity].client
&& !(g_entities[cg.snap->ps.viewEntity].client->ps.dualSabers && cg.snap->ps.weapon == WP_SABER)
&& cg.snap->ps.weapon != WP_MELEE && cg.snap->ps.weapon != WP_MELEE
&& !vr->weapon_stabilised && !vr->weapon_stabilised
&& !vr->in_vehicle && !vr->in_vehicle