diff --git a/cl_dll/Android.mk b/cl_dll/Android.mk index cf8d6bbc..16a646b9 100755 --- a/cl_dll/Android.mk +++ b/cl_dll/Android.mk @@ -29,9 +29,9 @@ SRCS+=../dlls/visitors/pipe.cpp SRCS+=../dlls/visitors/sniper.cpp SRCS+=../dlls/crossbow.cpp SRCS+=../dlls/crowbar.cpp -SRCS+=../dlls/egon.cpp +#SRCS+=../dlls/egon.cpp SRCS+=./ev_hldm.cpp -SRCS+=../dlls/gauss.cpp +#SRCS+=../dlls/gauss.cpp SRCS+=../dlls/handgrenade.cpp SRCS+=./hl/hl_baseentity.cpp SRCS+=./hl/hl_events.cpp diff --git a/cl_dll/CMakeLists.txt b/cl_dll/CMakeLists.txt index 814a9550..d1bb1439 100644 --- a/cl_dll/CMakeLists.txt +++ b/cl_dll/CMakeLists.txt @@ -33,8 +33,8 @@ set (CLDLL_SOURCES ../dlls/visitors/sniper.cpp ../dlls/crossbow.cpp ../dlls/crowbar.cpp - ../dlls/egon.cpp - ../dlls/gauss.cpp +# ../dlls/egon.cpp +# ../dlls/gauss.cpp ../dlls/handgrenade.cpp ../dlls/hornetgun.cpp ../dlls/mp5.cpp diff --git a/cl_dll/ev_hldm.cpp b/cl_dll/ev_hldm.cpp index 2045f29c..2166d107 100644 --- a/cl_dll/ev_hldm.cpp +++ b/cl_dll/ev_hldm.cpp @@ -57,14 +57,14 @@ void EV_FireShotGunDouble( struct event_args_s *args ); void EV_FireMP5( struct event_args_s *args ); void EV_FireMP52( struct event_args_s *args ); void EV_FirePython( struct event_args_s *args ); -void EV_FireGauss( struct event_args_s *args ); -void EV_SpinGauss( struct event_args_s *args ); +//void EV_FireGauss( struct event_args_s *args ); +//void EV_SpinGauss( struct event_args_s *args ); void EV_Crowbar( struct event_args_s *args ); void EV_FireCrossbow( struct event_args_s *args ); void EV_FireCrossbow2( struct event_args_s *args ); void EV_FireRpg( struct event_args_s *args ); -void EV_EgonFire( struct event_args_s *args ); -void EV_EgonStop( struct event_args_s *args ); +//void EV_EgonFire( struct event_args_s *args ); +//void EV_EgonStop( struct event_args_s *args ); void EV_HornetGunFire( struct event_args_s *args ); void EV_TripmineFire( struct event_args_s *args ); void EV_SnarkFire( struct event_args_s *args ); @@ -820,7 +820,7 @@ void EV_FirePython( event_args_t *args ) // GAUSS START //====================== #define SND_CHANGE_PITCH (1 << 7) // duplicated in protocol.h change sound pitch - +/* void EV_SpinGauss( event_args_t *args ) { int idx; @@ -842,22 +842,23 @@ void EV_SpinGauss( event_args_t *args ) gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "ambience/pulsemachine.wav", 1.0, ATTN_NORM, iSoundState, pitch ); } - +*/ /* ============================== EV_StopPreviousGauss ============================== */ +/* void EV_StopPreviousGauss( int idx ) { // Make sure we don't have a gauss spin event in the queue for this guy gEngfuncs.pEventAPI->EV_KillEvents( idx, "events/gaussspin.sc" ); gEngfuncs.pEventAPI->EV_StopSound( idx, CHAN_WEAPON, "ambience/pulsemachine.wav" ); } - +*/ extern float g_flApplyVel; - +/* void EV_FireGauss( event_args_t *args ) { int idx; @@ -1124,7 +1125,7 @@ void EV_FireGauss( event_args_t *args ) VectorAdd( tr.endpos, forward, vecSrc ); } } -} +}*/ //====================== // GAUSS END //====================== @@ -1369,7 +1370,7 @@ void EV_FireRpg( event_args_t *args ) //====================== // RPG END //====================== - +/* //====================== // EGON END //====================== @@ -1409,12 +1410,12 @@ enum EGON_FIREMODE #define EGON_SOUND_OFF "weapons/egon_off1.wav" #define EGON_SOUND_RUN "weapons/egon_run3.wav" #define EGON_SOUND_STARTUP "weapons/egon_windup2.wav" - +*/ #define ARRAYSIZE(p) ( sizeof(p) /sizeof(p[0]) ) BEAM *pBeam; BEAM *pBeam2; - +/* void EV_EgonFire( event_args_t *args ) { int idx, iFireState, iFireMode; @@ -1524,7 +1525,7 @@ void EV_EgonStop( event_args_t *args ) pBeam2 = NULL; } } -} +}*/ //====================== // EGON END //====================== diff --git a/cl_dll/hl/hl_events.cpp b/cl_dll/hl/hl_events.cpp index 45330d69..38cd8872 100644 --- a/cl_dll/hl/hl_events.cpp +++ b/cl_dll/hl/hl_events.cpp @@ -27,14 +27,14 @@ void EV_FireShotGunDouble( struct event_args_s *args ); void EV_FireMP5( struct event_args_s *args ); void EV_FireMP52( struct event_args_s *args ); void EV_FirePython( struct event_args_s *args ); -void EV_FireGauss( struct event_args_s *args ); -void EV_SpinGauss( struct event_args_s *args ); +//void EV_FireGauss( struct event_args_s *args ); +//void EV_SpinGauss( struct event_args_s *args ); void EV_Crowbar( struct event_args_s *args ); void EV_FireCrossbow( struct event_args_s *args ); void EV_FireCrossbow2( struct event_args_s *args ); void EV_FireRpg( struct event_args_s *args ); -void EV_EgonFire( struct event_args_s *args ); -void EV_EgonStop( struct event_args_s *args ); +//void EV_EgonFire( struct event_args_s *args ); +//void EV_EgonStop( struct event_args_s *args ); void EV_HornetGunFire( struct event_args_s *args ); void EV_TripmineFire( struct event_args_s *args ); void EV_SnarkFire( struct event_args_s *args ); @@ -67,15 +67,15 @@ void Game_HookEvents( void ) gEngfuncs.pfnHookEvent( "events/mp5.sc", EV_FireMP5 ); gEngfuncs.pfnHookEvent( "events/mp52.sc", EV_FireMP52 ); gEngfuncs.pfnHookEvent( "events/python.sc", EV_FirePython ); - gEngfuncs.pfnHookEvent( "events/gauss.sc", EV_FireGauss ); - gEngfuncs.pfnHookEvent( "events/gaussspin.sc", EV_SpinGauss ); + //gEngfuncs.pfnHookEvent( "events/gauss.sc", EV_FireGauss ); + //gEngfuncs.pfnHookEvent( "events/gaussspin.sc", EV_SpinGauss ); gEngfuncs.pfnHookEvent( "events/train.sc", EV_TrainPitchAdjust ); gEngfuncs.pfnHookEvent( "events/crowbar.sc", EV_Crowbar ); gEngfuncs.pfnHookEvent( "events/crossbow1.sc", EV_FireCrossbow ); gEngfuncs.pfnHookEvent( "events/crossbow2.sc", EV_FireCrossbow2 ); gEngfuncs.pfnHookEvent( "events/rpg.sc", EV_FireRpg ); - gEngfuncs.pfnHookEvent( "events/egon_fire.sc", EV_EgonFire ); - gEngfuncs.pfnHookEvent( "events/egon_stop.sc", EV_EgonStop ); + //gEngfuncs.pfnHookEvent( "events/egon_fire.sc", EV_EgonFire ); + //gEngfuncs.pfnHookEvent( "events/egon_stop.sc", EV_EgonStop ); gEngfuncs.pfnHookEvent( "events/firehornet.sc", EV_HornetGunFire ); gEngfuncs.pfnHookEvent( "events/tripfire.sc", EV_TripmineFire ); gEngfuncs.pfnHookEvent( "events/snarkfire.sc", EV_SnarkFire ); diff --git a/cl_dll/hl/hl_weapons.cpp b/cl_dll/hl/hl_weapons.cpp index 06afc55c..d88f4926 100644 --- a/cl_dll/hl/hl_weapons.cpp +++ b/cl_dll/hl/hl_weapons.cpp @@ -60,8 +60,8 @@ CMP5 g_Mp5; CCrossbow g_Crossbow; CShotgun g_Shotgun; CRpg g_Rpg; -CGauss g_Gauss; -CEgon g_Egon; +//CGauss g_Gauss; +//CEgon g_Egon; CHgun g_HGun; CHandGrenade g_HandGren; CSatchel g_Satchel; @@ -633,8 +633,8 @@ void HUD_InitClientWeapons( void ) HUD_PrepEntity( &g_Shotgun, &player ); HUD_PrepEntity( &g_Rpg, &player ); HUD_PrepEntity( &g_Gauss, &player ); - HUD_PrepEntity( &g_Egon, &player ); - HUD_PrepEntity( &g_HGun, &player ); + //HUD_PrepEntity( &g_Egon, &player ); + //HUD_PrepEntity( &g_HGun, &player ); HUD_PrepEntity( &g_HandGren, &player ); HUD_PrepEntity( &g_Satchel, &player ); HUD_PrepEntity( &g_Tripmine, &player ); @@ -725,12 +725,13 @@ void HUD_WeaponsPostThink( local_state_s *from, local_state_s *to, usercmd_t *cm case WEAPON_RPG: pWeapon = &g_Rpg; break; - case WEAPON_GAUSS: +/* case WEAPON_GAUSS: pWeapon = &g_Gauss; break; case WEAPON_EGON: pWeapon = &g_Egon; break; +*/ case WEAPON_HORNETGUN: pWeapon = &g_HGun; break; diff --git a/dlls/Android.mk b/dlls/Android.mk index 2f7a080e..74e7e057 100644 --- a/dlls/Android.mk +++ b/dlls/Android.mk @@ -49,7 +49,6 @@ LOCAL_SRC_FILES := agrunt.cpp airtank.cpp \ defaultai.cpp \ doors.cpp \ effects.cpp \ - egon.cpp \ explode.cpp \ flyingmonster.cpp \ func_break.cpp \ @@ -57,7 +56,6 @@ LOCAL_SRC_FILES := agrunt.cpp airtank.cpp \ game.cpp \ gamerules.cpp \ gargantua.cpp \ - gauss.cpp \ genericmonster.cpp \ ggrenade.cpp \ globals.cpp \ diff --git a/dlls/CMakeLists.txt b/dlls/CMakeLists.txt index a621d2f2..95133c14 100644 --- a/dlls/CMakeLists.txt +++ b/dlls/CMakeLists.txt @@ -51,7 +51,7 @@ set (SVDLL_SOURCES defaultai.cpp doors.cpp effects.cpp - egon.cpp +# egon.cpp explode.cpp flyingmonster.cpp func_break.cpp @@ -59,7 +59,7 @@ set (SVDLL_SOURCES game.cpp gamerules.cpp gargantua.cpp - gauss.cpp +# gauss.cpp genericmonster.cpp ggrenade.cpp globals.cpp diff --git a/dlls/player.cpp b/dlls/player.cpp index a62393a6..9482dd6d 100644 --- a/dlls/player.cpp +++ b/dlls/player.cpp @@ -3340,9 +3340,9 @@ void CBasePlayer::CheatImpulseCommands( int iImpulse ) GiveNamedItem( "ammo_357" ); GiveNamedItem( "weapon_crossbow" ); GiveNamedItem( "ammo_crossbow" ); - GiveNamedItem( "weapon_egon" ); - GiveNamedItem( "weapon_gauss" ); - GiveNamedItem( "ammo_gaussclip" ); + //GiveNamedItem( "weapon_egon" ); + //GiveNamedItem( "weapon_gauss" ); + //GiveNamedItem( "ammo_gaussclip" ); GiveNamedItem( "weapon_rpg" ); GiveNamedItem( "ammo_rpgclip" ); GiveNamedItem( "weapon_satchel" ); diff --git a/dlls/weapons.cpp b/dlls/weapons.cpp index ebefaf3a..22083189 100644 --- a/dlls/weapons.cpp +++ b/dlls/weapons.cpp @@ -323,8 +323,8 @@ void W_Precache( void ) UTIL_PrecacheOther( "ammo_357" ); // gauss - UTIL_PrecacheOtherWeapon( "weapon_gauss" ); - UTIL_PrecacheOther( "ammo_gaussclip" ); + //UTIL_PrecacheOtherWeapon( "weapon_gauss" ); + //UTIL_PrecacheOther( "ammo_gaussclip" ); // rpg UTIL_PrecacheOtherWeapon( "weapon_rpg" ); @@ -335,7 +335,7 @@ void W_Precache( void ) UTIL_PrecacheOther( "ammo_crossbow" ); // egon - UTIL_PrecacheOtherWeapon( "weapon_egon" ); + //UTIL_PrecacheOtherWeapon( "weapon_egon" ); #endif // tripmine UTIL_PrecacheOtherWeapon( "weapon_tripmine" ); @@ -1552,7 +1552,7 @@ TYPEDESCRIPTION CShotgun::m_SaveData[] = }; IMPLEMENT_SAVERESTORE( CShotgun, CBasePlayerWeapon ) - +/* TYPEDESCRIPTION CGauss::m_SaveData[] = { DEFINE_FIELD( CGauss, m_fInAttack, FIELD_INTEGER ), @@ -1577,7 +1577,7 @@ TYPEDESCRIPTION CEgon::m_SaveData[] = }; IMPLEMENT_SAVERESTORE( CEgon, CBasePlayerWeapon ) - +*/ TYPEDESCRIPTION CSatchel::m_SaveData[] = { DEFINE_FIELD( CSatchel, m_chargeReady, FIELD_INTEGER ), diff --git a/dlls/weapons.h b/dlls/weapons.h index 24b6c446..5d4ceefd 100644 --- a/dlls/weapons.h +++ b/dlls/weapons.h @@ -734,7 +734,7 @@ public: float m_flIgniteTime; CRpg *m_pLauncher;// pointer back to the launcher that fired me. }; - +/* class CGauss : public CBasePlayerWeapon { public: @@ -845,7 +845,7 @@ private: unsigned short m_usEgonFire; }; - +*/ class CHgun : public CBasePlayerWeapon { public: