From 8479382a966bae44ba4c72ef43378be51e5862c8 Mon Sep 17 00:00:00 2001 From: Gene Date: Fri, 21 Jun 2024 14:20:05 -0700 Subject: [PATCH] fiddle with panel turret missile origin --- code/cgame/cg_draw.cpp | 4 ++-- code/game/g_turret.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/cgame/cg_draw.cpp b/code/cgame/cg_draw.cpp index 10f030b20c..74e7bf6a38 100644 --- a/code/cgame/cg_draw.cpp +++ b/code/cgame/cg_draw.cpp @@ -3043,12 +3043,12 @@ static void CG_ScanForCrosshairEntity( qboolean scanAll ) {//100% accurate vec3_t d_f, d_rt, d_up; // If you're riding a vehicle and not being drawn. - if ( ( pVeh = G_IsRidingVehicle( cg_entities[0].gent ) ) != NULL && cg_entities[0].currentState.eFlags & EF_NODRAW ) + /* if ( ( pVeh = G_IsRidingVehicle( cg_entities[0].gent ) ) != NULL && cg_entities[0].currentState.eFlags & EF_NODRAW ) { VectorCopy( cg_entities[pVeh->m_pParentEntity->s.number].lerpOrigin, start ); AngleVectors( cg_entities[pVeh->m_pParentEntity->s.number].lerpAngles, d_f, d_rt, d_up ); } - else if ( cg.snap->ps.weapon == WP_NONE || cg.snap->ps.weapon == WP_SABER || cg.snap->ps.weapon == WP_STUN_BATON ) + else */ if ( cg.snap->ps.weapon == WP_NONE || cg.snap->ps.weapon == WP_SABER || cg.snap->ps.weapon == WP_STUN_BATON ) { if ( cg.snap->ps.viewEntity > 0 && cg.snap->ps.viewEntity < ENTITYNUM_WORLD ) {//in camera ent view diff --git a/code/game/g_turret.cpp b/code/game/g_turret.cpp index 8fc0ae3405..2b7e4e6b00 100644 --- a/code/game/g_turret.cpp +++ b/code/game/g_turret.cpp @@ -2307,7 +2307,7 @@ void panel_turret_shoot( gentity_t *self, vec3_t org, vec3_t dir) missile->classname = "b_proj"; missile->s.weapon = WP_TIE_FIGHTER; - VectorSet( missile->maxs, 9, 9, 9 ); + VectorSet( missile->maxs, 7, 7, 7 ); VectorScale( missile->maxs, -1, missile->mins ); missile->bounceCount = 0; @@ -2320,7 +2320,7 @@ void panel_turret_shoot( gentity_t *self, vec3_t org, vec3_t dir) G_SoundOnEnt( self, CHAN_AUTO, "sound/movers/objects/ladygun_fire" ); VectorMA( org, 32, dir, org ); - org[2] -= 4; + org[2] -= 5; G_PlayEffect( "ships/imp_blastermuzzleflash", org, dir ); } @@ -2520,7 +2520,7 @@ void SP_misc_panel_turret( gentity_t *self ) self->s.weapon = WP_TURRET; RegisterItem( FindItemForWeapon( WP_EMPLACED_GUN )); - RegisterItem( FindItemForWeapon( WP_TIE_FIGHTER )); //also register TIE blaster shot + RegisterItem( FindItemForWeapon( WP_TIE_FIGHTER )); //also register TIE blaster shot (why did Raven change the projectile from WP_EMPLACED_GUN to WP_TIE_FIGHTER?) gi.linkentity( self ); self->e_UseFunc = useF_panel_turret_use;