Browse Source

Remove useless stuff.

poke646_vendetta
Night Owl 6 years ago
parent
commit
8756558847
  1. 55
      cl_dll/ev_hldm.cpp
  2. 2
      cl_dll/hl/hl_events.cpp
  3. 4
      dlls/Android.mk
  4. 5
      dlls/CMakeLists.txt
  5. 3
      dlls/hgrunt.cpp
  6. 6
      dlls/player.cpp

55
cl_dll/ev_hldm.cpp

@ -56,7 +56,6 @@ void EV_FireShotGunSingle( struct event_args_s *args );
void EV_TrainPitchAdjust( struct event_args_s *args ); void EV_TrainPitchAdjust( struct event_args_s *args );
void EV_SpinXS(struct event_args_s *args);
void EV_FirePar21(struct event_args_s *args); void EV_FirePar21(struct event_args_s *args);
void EV_M203(struct event_args_s *args); void EV_M203(struct event_args_s *args);
} }
@ -683,60 +682,6 @@ int EV_TFC_IsAllyTeam( int iTeam1, int iTeam2 )
return 0; return 0;
} }
//======================
// XENSQUASHER START
//======================
enum xensquasher_e
{
XS_IDLE = 0,
XS_IDLE2,
XS_FIDGET,
XS_SPINUP,
XS_SPIN,
XS_FIRE,
XS_FIRE2,
XS_HOLSTER,
XS_DRAW,
XS_RELOAD,
};
void EV_StopPreviousXS( int idx )
{
// Make sure we don't have a gauss spin event in the queue for this guy
gEngfuncs.pEventAPI->EV_KillEvents( idx, "events/xsspin.sc" );
gEngfuncs.pEventAPI->EV_StopSound( idx, CHAN_WEAPON, "weapons/xs_windup.wav" );
if( EV_IsLocal( idx ) )
gEngfuncs.pEventAPI->EV_WeaponAnimation( XS_FIRE2, 2 );
}
void EV_SpinXS( event_args_t *args )
{
int idx;
vec3_t origin;
vec3_t angles;
vec3_t velocity;
int iSoundState = 0;
int pitch;
idx = args->entindex;
if( args->bparam2 )
{
EV_StopPreviousXS( idx );
return;
}
VectorCopy( args->origin, origin );
// VectorCopy( args->angles, angles );
// VectorCopy( args->velocity, velocity );
pitch = args->iparam1;
iSoundState = args->bparam1 ? SND_CHANGE_PITCH : 0;
gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/xs_windup.wav", 1.0, ATTN_NORM, iSoundState, pitch );
}
//====================== //======================
// PAR21 START // PAR21 START

2
cl_dll/hl/hl_events.cpp

@ -26,7 +26,6 @@ void EV_FireShotGunSingle( struct event_args_s *args );
void EV_TrainPitchAdjust( struct event_args_s *args ); void EV_TrainPitchAdjust( struct event_args_s *args );
void EV_SpinXS( struct event_args_s *args );
void EV_FirePar21( struct event_args_s *args ); void EV_FirePar21( struct event_args_s *args );
void EV_M203( struct event_args_s *args ); void EV_M203( struct event_args_s *args );
} }
@ -49,7 +48,6 @@ void Game_HookEvents( void )
// gEngfuncs.pfnHookEvent( "events/glock1.sc", EV_FireGlock1 ); // gEngfuncs.pfnHookEvent( "events/glock1.sc", EV_FireGlock1 );
// gEngfuncs.pfnHookEvent( "events/glock2.sc", EV_FireGlock2 ); // gEngfuncs.pfnHookEvent( "events/glock2.sc", EV_FireGlock2 );
gEngfuncs.pfnHookEvent( "events/shotgun1.sc", EV_FireShotGunSingle ); gEngfuncs.pfnHookEvent( "events/shotgun1.sc", EV_FireShotGunSingle );
gEngfuncs.pfnHookEvent( "events/xsspin.sc", EV_SpinXS );
gEngfuncs.pfnHookEvent( "events/par21.sc", EV_FirePar21 ); gEngfuncs.pfnHookEvent( "events/par21.sc", EV_FirePar21 );
gEngfuncs.pfnHookEvent( "events/m203.sc", EV_M203 ); gEngfuncs.pfnHookEvent( "events/m203.sc", EV_M203 );
gEngfuncs.pfnHookEvent( "events/train.sc", EV_TrainPitchAdjust ); gEngfuncs.pfnHookEvent( "events/train.sc", EV_TrainPitchAdjust );

4
dlls/Android.mk

@ -56,11 +56,9 @@ LOCAL_SRC_FILES := agrunt.cpp airtank.cpp \
func_tank.cpp \ func_tank.cpp \
game.cpp \ game.cpp \
gamerules.cpp \ gamerules.cpp \
gauss.cpp \
gargantua.cpp \ gargantua.cpp \
genericmonster.cpp \ genericmonster.cpp \
ggrenade.cpp \ ggrenade.cpp \
glock.cpp \
globals.cpp \ globals.cpp \
gman.cpp \ gman.cpp \
h_ai.cpp \ h_ai.cpp \
@ -128,9 +126,7 @@ LOCAL_SRC_FILES := agrunt.cpp airtank.cpp \
poke646/firetrail.cpp \ poke646/firetrail.cpp \
poke646/genericmodel.cpp \ poke646/genericmodel.cpp \
poke646/mp3.cpp \ poke646/mp3.cpp \
poke646/nail.cpp \
poke646/robocop.cpp \ poke646/robocop.cpp \
poke646/xsbeam.cpp \
vendetta/par21.cpp vendetta/par21.cpp
# ../game_shared/voice_gamemgr.cpp # ../game_shared/voice_gamemgr.cpp

5
dlls/CMakeLists.txt

@ -68,11 +68,9 @@ set (SVDLL_SOURCES
game.cpp game.cpp
gamerules.cpp gamerules.cpp
gargantua.cpp gargantua.cpp
gauss.cpp
genericmonster.cpp genericmonster.cpp
ggrenade.cpp ggrenade.cpp
globals.cpp globals.cpp
glock.cpp
gman.cpp gman.cpp
h_ai.cpp h_ai.cpp
h_battery.cpp h_battery.cpp
@ -97,7 +95,6 @@ set (SVDLL_SOURCES
monsters.cpp monsters.cpp
monsterstate.cpp monsterstate.cpp
mortar.cpp mortar.cpp
mp5.cpp
multiplay_gamerules.cpp multiplay_gamerules.cpp
nihilanth.cpp nihilanth.cpp
nodes.cpp nodes.cpp
@ -143,9 +140,7 @@ set (SVDLL_SOURCES
poke646/firetrail.cpp poke646/firetrail.cpp
poke646/genericmodel.cpp poke646/genericmodel.cpp
poke646/mp3.cpp poke646/mp3.cpp
poke646/nail.cpp
poke646/robocop.cpp poke646/robocop.cpp
poke646/xsbeam.cpp
vendetta/par21.cpp vendetta/par21.cpp
) )

3
dlls/hgrunt.cpp

@ -1019,9 +1019,6 @@ void CHGrunt::Spawn()
// pev->weapons = HGRUNT_9MMAR | HGRUNT_GRENADELAUNCHER; // pev->weapons = HGRUNT_9MMAR | HGRUNT_GRENADELAUNCHER;
} }
if( FBitSet( pev->weapons, HGRUNT_GRENADELAUNCHER ) )
ClearBits( pev->weapons, HGRUNT_GRENADELAUNCHER );
if( FBitSet( pev->weapons, HGRUNT_SHOTGUN ) ) if( FBitSet( pev->weapons, HGRUNT_SHOTGUN ) )
{ {
SetBodygroup( GUN_GROUP, GUN_SHOTGUN ); SetBodygroup( GUN_GROUP, GUN_SHOTGUN );

6
dlls/player.cpp

@ -3350,16 +3350,10 @@ void CBasePlayer::CheatImpulseCommands( int iImpulse )
case 101: case 101:
gEvilImpulse101 = TRUE; gEvilImpulse101 = TRUE;
GiveNamedItem( "weapon_heaterpipe" ); GiveNamedItem( "weapon_heaterpipe" );
GiveNamedItem( "weapon_bradnailer" );
GiveNamedItem( "ammo_nailclip" );
GiveNamedItem( "weapon_nailgun" );
GiveNamedItem( "ammo_nailround" );
GiveNamedItem( "weapon_shotgun" ); GiveNamedItem( "weapon_shotgun" );
GiveNamedItem( "ammo_buckshot" ); GiveNamedItem( "ammo_buckshot" );
GiveNamedItem( "weapon_cmlwbr" ); GiveNamedItem( "weapon_cmlwbr" );
GiveNamedItem( "ammo_bolts" ); GiveNamedItem( "ammo_bolts" );
GiveNamedItem( "weapon_xs" );
GiveNamedItem( "ammo_xencandy" );
GiveNamedItem( "weapon_pipebomb" ); GiveNamedItem( "weapon_pipebomb" );
GiveNamedItem( "weapon_par21" ); GiveNamedItem( "weapon_par21" );
GiveNamedItem( "ammo_par21_clip" ); GiveNamedItem( "ammo_par21_clip" );

Loading…
Cancel
Save