Skip to content

Commit

Permalink
More accurate weapons implementation.
Browse files Browse the repository at this point in the history
  • Loading branch information
@nekonomicon
nekonomicon committed Jan 2, 2024
1 parent 112892a commit dc79f4a
Show file tree
Hide file tree
Showing 21 changed files with 1,117 additions and 985 deletions.
7 changes: 7 additions & 0 deletions cl_dll/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ set (CLDLL_SOURCES
../dlls/squeakgrenade.cpp
../dlls/tripmine.cpp
../dlls/glock.cpp
../dlls/clcampaign/hammer.cpp
../dlls/clcampaign/katana.cpp
../dlls/clcampaign/needle.cpp
../dlls/clcampaign/pepsigun.cpp
../dlls/clcampaign/rock.cpp
../dlls/clcampaign/sawnoff.cpp
../dlls/clcampaign/sniper.cpp
ev_hldm.cpp
hl/hl_baseentity.cpp
hl/hl_events.cpp
Expand Down
283 changes: 283 additions & 0 deletions cl_dll/ev_hldm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@ void EV_TripmineFire( struct event_args_s *args );
void EV_SnarkFire( struct event_args_s *args );

void EV_TrainPitchAdjust( struct event_args_s *args );

void EV_Katana( event_args_t *args );
void EV_FireSnipars( event_args_t *args );
void EV_FirePepsigun( event_args_t *args );
void EV_Hammer( event_args_t *args );
void EV_FireSawnoff( event_args_t *args );
void EV_FireRock( event_args_t *args );
void EV_FireNeedle( event_args_t *args );
}

#define VECTOR_CONE_1DEGREES Vector( 0.00873f, 0.00873f, 0.00873f )
Expand Down Expand Up @@ -1756,3 +1764,278 @@ int EV_TFC_IsAllyTeam( int iTeam1, int iTeam2 )
{
return 0;
}

//======================
// KATANA START
//======================
enum katana_e
{
KATANA_IDLE = 0,
KATANA_DRAW,
KATANA_HOLSTER,
KATANA_ATTACK1HIT,
KATANA_ATTACK1MISS,
KATANA_ATTACK2MISS,
KATANA_ATTACK2HIT,
KATANA_ATTACK3MISS,
#if !CROWBAR_IDLE_ANIM
KATANA_ATTACK3HIT
#else
KATANA_ATTACK3HIT,
KATANA_IDLE2,
KATANA_IDLE3
#endif
};

// int g_iSwing;

//Only predict the miss sounds, hit sounds are still played
//server side, so players don't get the wrong idea.
void EV_Katana( event_args_t *args )
{
int idx;
vec3_t origin;
//vec3_t angles;
//vec3_t velocity;

idx = args->entindex;
VectorCopy( args->origin, origin );

//Play Swing sound
gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/katana_miss1.wav", 1, ATTN_NORM, 0, PITCH_NORM );

if( EV_IsLocal( idx ) )
{
switch( (g_iSwing++) % 3 )
{
case 0:
gEngfuncs.pEventAPI->EV_WeaponAnimation( KATANA_ATTACK1MISS, 0 );
break;
case 1:
gEngfuncs.pEventAPI->EV_WeaponAnimation( KATANA_ATTACK2MISS, 0 );
break;
case 2:
gEngfuncs.pEventAPI->EV_WeaponAnimation( KATANA_ATTACK3MISS, 0 );
break;
}
}
}
//======================
// KATANA END
//======================

//======================
// SNIPARS START
//======================
void EV_FireSnipars( event_args_t *args )
{
int idx;
vec3_t origin;
vec3_t angles;
vec3_t velocity;

vec3_t ShellVelocity;
vec3_t ShellOrigin;
vec3_t vecSrc, vecAiming;
vec3_t up, right, forward;
//float flSpread = 0.01;

idx = args->entindex;
VectorCopy( args->origin, origin );
VectorCopy( args->angles, angles );
VectorCopy( args->velocity, velocity );

AngleVectors( angles, forward, right, up );


if( EV_IsLocal( idx ) )
{
// Add muzzle flash to current weapon model
EV_MuzzleFlash();
gEngfuncs.pEventAPI->EV_WeaponAnimation( SNIPARS_FIRE, 0 );

V_PunchAxis( 0, gEngfuncs.pfnRandomFloat( 0, -10 ) );
}

switch( gEngfuncs.pfnRandomLong( 0, 4 ) )
{
case 0:
gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/sniper_shoot1.wav", gEngfuncs.pfnRandomFloat( 0.8f, 0.9f ), ATTN_NORM, 0, PITCH_NORM );
break;
case 1:
gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/sniper_shoot2.wav", gEngfuncs.pfnRandomFloat( 0.8f, 0.9f ), ATTN_NORM, 0, PITCH_NORM );
break;
case 2:
gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/sniper_shoot3.wav", gEngfuncs.pfnRandomFloat( 0.8f, 0.9f ), ATTN_NORM, 0, PITCH_NORM );
break;
case 3:
gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/sniper_shoot4.wav", gEngfuncs.pfnRandomFloat( 0.8f, 0.9f ), ATTN_NORM, 0, PITCH_NORM );
break;
case 4:
gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/sniper_shoot5.wav", gEngfuncs.pfnRandomFloat( 0.8f, 0.9f ), ATTN_NORM, 0, PITCH_NORM );
break;
}

EV_GetGunPosition( args, vecSrc, origin );
VectorCopy( forward, vecAiming );

EV_HLDM_FireBullets( idx, forward, right, up, 1, vecSrc, vecAiming, 8192, BULLET_PLAYER_357, 0, &g_tracerCount[idx - 1], args->fparam1, args->fparam2 );
}

//======================
// SNIPARS END
//======================

//======================
// PEPSIGUN START
//======================
void EV_FirePepsigun( event_args_t *args )
{
/*
int idx;
vec3_t origin;
vec3_t angles;
vec3_t velocity;
vec3_t ShellVelocity;
vec3_t ShellOrigin;
int shell;
vec3_t vecSrc, vecAiming;
vec3_t up, right, forward;
idx = args->entindex;
VectorCopy( args->origin, origin );
VectorCopy( args->angles, angles );
VectorCopy( args->velocity, velocity );
AngleVectors( angles, forward, right, up );
EV_GetGunPosition( args, vecSrc, origin );
VectorCopy( forward, vecAiming );
*/
}

//======================
// PEPSIGUN END
//======================

//======================
// HAMMER START
//======================
enum hammer_e
{
HAMMER_IDLE = 0,
HAMMER_DRAW,
HAMMER_ATTACK
};

//Only predict the miss sounds, hit sounds are still played
//server side, so players don't get the wrong idea.
void EV_Hammer( event_args_t *args )
{
int idx;
vec3_t origin;

idx = args->entindex;
VectorCopy( args->origin, origin );

//Play Swing sound
gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/cbar_miss1.wav", 1, ATTN_NORM, 0, PITCH_NORM );

if( EV_IsLocal( idx ))
gEngfuncs.pEventAPI->EV_WeaponAnimation( HAMMER_ATTACK, 0 );
}
//======================
// HAMMER END
//======================

//======================
// SAWNOFF START
//======================
void EV_FireSawnoff( event_args_t *args )
{
int idx;
vec3_t origin;
vec3_t angles;
vec3_t velocity;

int j;
vec3_t ShellVelocity;
vec3_t ShellOrigin;
int shell;
vec3_t vecSrc, vecAiming;
vec3_t up, right, forward;

idx = args->entindex;
VectorCopy( args->origin, origin );
VectorCopy( args->angles, angles );
VectorCopy( args->velocity, velocity );

AngleVectors( angles, forward, right, up );

if( EV_IsLocal( idx ) )
{
// Add muzzle flash to current weapon model
EV_MuzzleFlash();
gEngfuncs.pEventAPI->EV_WeaponAnimation( SAWNOFF_FIRE, 0 );
V_PunchAxis( 0, -10.0 );
}

gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/sshotgun_shoot.wav", gEngfuncs.pfnRandomFloat( 0.8f, 0.9f ), ATTN_NORM, 0, PITCH_NORM );

EV_GetGunPosition( args, vecSrc, origin );
VectorCopy( forward, vecAiming );

EV_HLDM_FireBullets( idx, forward, right, up, 18, vecSrc, vecAiming, 2048, BULLET_PLAYER_BUCKSHOT, 0, &g_tracerCount[idx - 1], 0.17365, 0.17365 );
}
//======================
// SAWNOFF END
//======================

//======================
// ROCK START
//======================
void EV_FireRock( event_args_t *args )
{
/* int idx;
vec3_t origin;
vec3_t angles;
vec3_t velocity;
vec3_t ShellVelocity;
vec3_t ShellOrigin;
int shell;
vec3_t vecSrc, vecAiming;
vec3_t up, right, forward;
idx = args->entindex;
VectorCopy( args->origin, origin );
VectorCopy( args->angles, angles );
VectorCopy( args->velocity, velocity );
AngleVectors( angles, forward, right, up );
EV_GetGunPosition( args, vecSrc, origin );
VectorCopy( forward, vecAiming );*/
}

//======================
// ROCK END
//======================

//======================
// NEEDLE START
//======================
void EV_FireNeedle( event_args_t *args )
{
int idx;

idx = args->entindex;

if( EV_IsLocal( idx ))
gEngfuncs.pEventAPI->EV_WeaponAnimation( NEEDLE_GIVESHOT, 0 );
}

//======================
// NEEDLE END
//======================
29 changes: 29 additions & 0 deletions cl_dll/ev_hldm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,35 @@ enum gauss_e
GAUSS_DRAW
};

enum sniper_e
{
SNIPARS_IDLE = 0,
SNIPARS_DRAW,
SNIPARS_FIRE,
SNIPARS_RELOAD
};

enum sawnoff_e
{
SAWNOFF_IDLE = 0,
SAWNOFF_FIRE,
SAWNOFF_FIRE2,
SAWNOFF_RELOAD,
SAWNOFF_PUMP,
SAWNOFF_START_RELOAD,
SAWNOFF_DRAW,
SAWNOFF_HOLSTER,
SAWNOFF_IDLE4,
SAWNOFF_IDLE_DEEP
};

enum needle_e
{
NEEDLE_IDLE1,
NEEDLE_GIVESHOT,
NEEDLE_DRAW
};

void EV_HLDM_GunshotDecalTrace( pmtrace_t *pTrace, char *decalName );
void EV_HLDM_DecalGunshot( pmtrace_t *pTrace, int iBulletType );
int EV_HLDM_CheckTracer( int idx, float *vecSrc, float *end, float *forward, float *right, int iBulletType, int iTracerFreq, int *tracerCount );
Expand Down
15 changes: 15 additions & 0 deletions cl_dll/hl/hl_events.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ void EV_TripmineFire( struct event_args_s *args );
void EV_SnarkFire( struct event_args_s *args );

void EV_TrainPitchAdjust( struct event_args_s *args );

void EV_Katana( event_args_t *args );
void EV_FireSnipars( event_args_t *args );
void EV_FirePepsigun( event_args_t *args );
void EV_Hammer( event_args_t *args );
void EV_FireSawnoff( event_args_t *args );
void EV_FireRock( event_args_t *args );
void EV_FireNeedle( event_args_t *args );
}

/*
Expand Down Expand Up @@ -76,4 +84,11 @@ void Game_HookEvents( void )
gEngfuncs.pfnHookEvent( "events/firehornet.sc", EV_HornetGunFire );
gEngfuncs.pfnHookEvent( "events/tripfire.sc", EV_TripmineFire );
gEngfuncs.pfnHookEvent( "events/snarkfire.sc", EV_SnarkFire );
gEngfuncs.pfnHookEvent( "events/katana.sc", EV_Katana );
gEngfuncs.pfnHookEvent( "events/snipars.sc", EV_FireSnipars );
gEngfuncs.pfnHookEvent( "events/pepsigun.sc", EV_FirePepsigun );
gEngfuncs.pfnHookEvent( "events/hammer.sc", EV_Hammer );
gEngfuncs.pfnHookEvent( "events/sawnoff.sc", EV_FireSawnoff );
gEngfuncs.pfnHookEvent( "events/rock.sc", EV_FireRock );
gEngfuncs.pfnHookEvent( "events/needle.sc", EV_FireNeedle );
}
Loading

0 comments on commit dc79f4a

Please sign in to comment.