YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-03-13 05:51:19 +00:00
Code Issues Projects Releases Wiki Activity

HL:Invasion Code clean-up, fix weapon definitions not being in weapons.h, e.t.c.

Browse Source
This commit is contained in:
Roy Shapiro 2022-07-08 17:18:15 +03:00
parent 5cad247127
commit 0e4e049410
29 changed files with 145 additions and 486 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cl_dll/crutches.h
View File

@ -9,3 +9,5 @@ some of the HL:Invasion annoyances.
#define DONTSAVECAMERASFIX_INVASION_DLL //pSprite shouldn't be a member of m_SaveData in monster_camera, otherwise saving stops working after them being deactivated.
#define L2M3CRASHFIXPATH_INVASION_DLL //l2m3 map has a multi-manager targeting func_doors tremble_1 and tremble_2, which causes a segmentation fault CTD at least if the lib isn't compiled as GoldSource compatible. So we swap it's targets with something that doesn't exist.
#define NOATTACKFIXPATH_INVASION_VGUI //prevent attacks while VGUI is active.
#define RADIOMSGCUTSHORTFIX_INVASION_DLL //some symbols get cut from the radio messages if an additional +1 byte is not added to the for--each loop.
//define WATERWAVENONFIX_INVASION_DLL //The WaterWave effect in util.cpp doesn't actually work properly (it renders an ugly semi-triangle instead of a circle). Disable it until as solution is found.

14
cl_dll/ev_hldm.cpp
View File

@ -912,7 +912,7 @@ void EV_HLDM_FireBullets( int idx, float *forward, float *right, float *up, int
vecSpread[0] = flSpreadX; //modif de modif de Julien, compatibility fix.
vecSpread[1] = flSpreadY;
vecSpread[2] = flSpreadX; //Just in case, won't be read.
EV_HLDM_FireBulletsOld( idx, forward, right, up, 1, vecSource, forward, vecSpread, 8192, iBulletType, 0, &tracerCount[idx-1], 1 );
EV_HLDM_FireBulletsVect( idx, forward, right, up, 1, vecSource, forward, vecSpread, 8192, iBulletType, 0, &tracerCount[idx-1], 1 );
}
}
@ -1049,7 +1049,7 @@ void EV_FireShotGunDouble( event_args_t *args )
else
{
//EV_HLDM_FireBullets( idx, forward, right, up, 12, vecSrc, vecAiming, 2048, BULLET_PLAYER_BUCKSHOT_DOUBLE, 0, &g_tracerCount[idx - 1], 0.08716, 0.08716 );
EV_HLDM_FireBulletsOld( idx, forward, right, up, 12, vecSrc, vecAiming, VECTOR_CONE_10DEGREES, 2048, BULLET_PLAYER_BUCKSHOT_DOUBLE, 0, &g_tracerCount[idx-1] );
EV_HLDM_FireBulletsVect( idx, forward, right, up, 12, vecSrc, vecAiming, VECTOR_CONE_10DEGREES, 2048, BULLET_PLAYER_BUCKSHOT_DOUBLE, 0, &g_tracerCount[idx-1] );
}
}
@ -1165,11 +1165,11 @@ void EV_FireMP5( event_args_t *args )
//Julien's code uses old Vector for vecSpread which is vec3_t, needs conversion.
if ( gEngfuncs.GetMaxClients() > 1 )
{
EV_HLDM_FireBulletsOld( idx, forward, right, up, 1, vecSrc, vecAiming, VECTOR_CONE_7DEGREES, 8192, BULLET_PLAYER_MP5, 2, &g_tracerCount[idx-1] );
EV_HLDM_FireBulletsVect( idx, forward, right, up, 1, vecSrc, vecAiming, VECTOR_CONE_7DEGREES, 8192, BULLET_PLAYER_MP5, 2, &g_tracerCount[idx-1] );
}
else
{
EV_HLDM_FireBulletsOld( idx, forward, right, up, 1, vecSrc, vecAiming, VECTOR_CONE_7DEGREES, 8192, BULLET_PLAYER_MP5, 2, &g_tracerCount[idx-1] );
EV_HLDM_FireBulletsVect( idx, forward, right, up, 1, vecSrc, vecAiming, VECTOR_CONE_7DEGREES, 8192, BULLET_PLAYER_MP5, 2, &g_tracerCount[idx-1] );
}
}
@ -1299,7 +1299,7 @@ void EV_FireM16( event_args_t *args )
EV_GetGunPosition( args, vecSrc, origin );
VectorCopy( forward, vecAiming );
EV_HLDM_FireBulletsOld( idx, forward, right, up, 1, vecSrc, vecAiming, VECTOR_CONE_4DEGREES, 8192, BULLET_PLAYER_M16, 2, &g_tracerCount[idx-1] );
EV_HLDM_FireBulletsVect( idx, forward, right, up, 1, vecSrc, vecAiming, VECTOR_CONE_4DEGREES, 8192, BULLET_PLAYER_M16, 2, &g_tracerCount[idx-1] );
if ( EV_IsLocal( idx ) )
{
@ -1366,7 +1366,7 @@ void EV_FireFSniper( event_args_t *args )
EV_GetGunPosition( args, vecSrc, origin );
VectorCopy( forward, vecAiming );
EV_HLDM_FireBulletsOld( idx, forward, right, up, 1, vecSrc, vecAiming, Vector(0,0,0)/*VECTOR_CONE_1DEGREES*/, 8192, BULLET_PLAYER_SNIPER, 1, &g_tracerCount[idx-1] );
EV_HLDM_FireBulletsVect( idx, forward, right, up, 1, vecSrc, vecAiming, Vector(0,0,0)/*VECTOR_CONE_1DEGREES*/, 8192, BULLET_PLAYER_SNIPER, 1, &g_tracerCount[idx-1] );
if ( EV_IsLocal( idx ) )
{
@ -1436,7 +1436,7 @@ void EV_FireIRgun( event_args_t *args )
VectorCopy( forward, vecAiming );
EV_HLDM_FireBulletsOld( idx, forward, right, up, 1, vecSrc, vecAiming, VECTOR_CONE_1DEGREES, 8192, BULLET_PLAYER_IRGUN, 0, &g_tracerCount[idx-1] );
EV_HLDM_FireBulletsVect( idx, forward, right, up, 1, vecSrc, vecAiming, VECTOR_CONE_1DEGREES, 8192, BULLET_PLAYER_IRGUN, 0, &g_tracerCount[idx-1] );
if ( EV_IsLocal( idx ) )
{

2
cl_dll/ev_hldm.h
View File

@ -149,7 +149,7 @@ 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 );
void EV_HLDM_FireBullets( int idx, float *forward, float *right, float *up, int cShots, float *vecSrc, float *vecDirShooting, float flDistance, int iBulletType, int iTracerFreq, int *tracerCount, float flSpreadX, float flSpreadY, int iTraverseMur = 0 );
void EV_HLDM_FireBulletsOld( int idx, float *forward, float *right, float *up, int cShots, float *vecSrc, float *vecDirShooting, float *vecSpread, float flDistance, int iBulletType, int iTracerFreq, int *tracerCount, int iTraverseMur = 0 ){ //Julien's code uses old version of this function that was like this, we need to convert the Vector vec3_t into floats.
void EV_HLDM_FireBulletsVect( int idx, float *forward, float *right, float *up, int cShots, float *vecSrc, float *vecDirShooting, float *vecSpread, float flDistance, int iBulletType, int iTracerFreq, int *tracerCount, int iTraverseMur = 0 ){ //Julien's code uses old version of this function that took vector definitions like this, so we need to convert the Vector vec3_t into floats. This way we can keep using definitions, modif de Roy
float flSpreadX = vecSpread[0];
float flSpreadY = vecSpread[1];
return EV_HLDM_FireBullets(idx,forward,right,up,cShots,vecSrc,vecDirShooting,flDistance,iBulletType,iTracerFreq,tracerCount,flSpreadX,flSpreadY,iTraverseMur);

3
cl_dll/health.cpp
View File

@ -497,7 +497,8 @@ int CHudHealth::DrawDamage(float flTime)
}
}
int i = 0; //Loop iterator fix.
int i = 0; //We need to declare this variable outside of the loop, modif de Roy
// check for bits that should be expired
for ( i = 0; i < NUM_DMG_TYPES; i++ )
{

2
cl_dll/hl/hl_baseentity.cpp
View File

@ -280,8 +280,6 @@ void CBasePlayer::FlashlightTurnOn( void ) { }
void CBasePlayer::FlashlightTurnOff( void ) { }
void CBasePlayer::ForceClientDllUpdate( void ) { }
void CBasePlayer::ImpulseCommands() { }
//modif de Julien 7/7/01
//BOOL CBasePlayer::IsInGaz( ) { return FALSE; } //Here
void CBasePlayer::CheatImpulseCommands( int iImpulse ) { }
int CBasePlayer::AddPlayerItem( CBasePlayerItem *pItem ) { return FALSE; }
int CBasePlayer::RemovePlayerItem( CBasePlayerItem *pItem, bool bCallHoster ) { return FALSE; }

97
cl_dll/hl/hl_weapons.cpp
View File

@ -54,20 +54,7 @@ int g_irunninggausspred = 0;
vec3_t previousorigin;
// HLDM Weapon placeholder entities.
CGlock g_Glock;
/*CCrowbar g_Crowbar; //modif de Julien o para Julien, those cause compile-time errors and were not present here at the time.
CPython g_Python;
CMP5 g_Mp5;
CCrossbow g_Crossbow;
CShotgun g_Shotgun;
CRpg g_Rpg;
CGauss g_Gauss;
CEgon g_Egon;
CHgun g_HGun;
CHandGrenade g_HandGren;
CSatchel g_Satchel;
CTripmine g_Tripmine;
CSqueak g_Snark;*/
CGlock g_Glock; //This is the only client-based weapon, as per Julien's code for the old API, modif de Roy
/*
======================
@ -607,20 +594,7 @@ void HUD_InitClientWeapons( void )
HUD_PrepEntity( &player, NULL );
// Allocate slot(s) for each weapon that we are going to be predicting
HUD_PrepEntity( &g_Glock, &player );
/*HUD_PrepEntity( &g_Crowbar, &player ); //modif de Julien o para Julien, those cause compile-time errors and were not present here at the time.
HUD_PrepEntity( &g_Python, &player );
HUD_PrepEntity( &g_Mp5, &player );
HUD_PrepEntity( &g_Crossbow, &player );
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_HandGren, &player );
HUD_PrepEntity( &g_Satchel, &player );
HUD_PrepEntity( &g_Tripmine, &player );
HUD_PrepEntity( &g_Snark, &player );*/
HUD_PrepEntity( &g_Glock, &player ); //This is the only client-based weapon, as per Julien's code for the old API, modif de Roy
}
/*
@ -677,10 +651,6 @@ void HUD_WeaponsPostThink( local_state_s *from, local_state_s *to, usercmd_t *cm
HUD_InitClientWeapons();
/*if ( m_iPlayerInTankExternal == true ){ //Do not activate while in the tank modif de Roy
return; //For client weapons (glock, specifically) modif de Roy
}*/
// Get current clock
gpGlobals->time = time;
@ -688,48 +658,9 @@ void HUD_WeaponsPostThink( local_state_s *from, local_state_s *to, usercmd_t *cm
// FIXME, make this a method in each weapon? where you pass in an entity_state_t *?
switch( from->client.m_iId )
{
/*case WEAPON_CROWBAR: //modif de Julien o para Julien, those cause compile-time errors and were not present here at the time.
pWeapon = &g_Crowbar;
break;*/
case WEAPON_GLOCK: //Only glock was here.
case WEAPON_GLOCK: //This is the only client-based weapon, as per Julien's code for the old API, modif de Roy
pWeapon = &g_Glock;
break;
/*case WEAPON_PYTHON:
pWeapon = &g_Python;
break;
case WEAPON_MP5:
pWeapon = &g_Mp5;
break;
case WEAPON_CROSSBOW:
pWeapon = &g_Crossbow;
break;
case WEAPON_SHOTGUN:
pWeapon = &g_Shotgun;
break;
case WEAPON_RPG:
pWeapon = &g_Rpg;
break;
case WEAPON_GAUSS:
pWeapon = &g_Gauss;
break;
case WEAPON_EGON:
pWeapon = &g_Egon;
break;
case WEAPON_HORNETGUN:
pWeapon = &g_HGun;
break;
case WEAPON_HANDGRENADE:
pWeapon = &g_HandGren;
break;
case WEAPON_SATCHEL:
pWeapon = &g_Satchel;
break;
case WEAPON_TRIPMINE:
pWeapon = &g_Tripmine;
break;
case WEAPON_SNARK:
pWeapon = &g_Snark;
break;*/
}
// Store pointer to our destination entity_state_t so we can get our origin, etc. from it
@ -834,12 +765,6 @@ void HUD_WeaponsPostThink( local_state_s *from, local_state_s *to, usercmd_t *cm
player.m_pActiveItem = g_pWpns[from->client.m_iId];
}
/*if( player.m_pActiveItem->m_iId == WEAPON_RPG ) //modif de Julien o para Julien, those cause compile-time errors and were not present here at the time.
{
( (CRpg *)player.m_pActiveItem )->m_fSpotActive = (int)from->client.vuser2[1];
( (CRpg *)player.m_pActiveItem )->m_cActiveRockets = (int)from->client.vuser2[2];
}*/
// Don't go firing anything if we have died.
// Or if we don't have a weapon model deployed
if( ( player.pev->deadflag != ( DEAD_DISCARDBODY + 1 ) ) &&
@ -902,28 +827,12 @@ void HUD_WeaponsPostThink( local_state_s *from, local_state_s *to, usercmd_t *cm
to->client.vuser2[0] = player.ammo_hornets;
to->client.ammo_rockets = player.ammo_rockets;
/*if( player.m_pActiveItem->m_iId == WEAPON_RPG ) //modif de Julien o para Julien, those cause compile-time errors and were not present here at the time.
{
to->client.vuser2[1] = ( (CRpg *)player.m_pActiveItem)->m_fSpotActive;
to->client.vuser2[2] = ( (CRpg *)player.m_pActiveItem)->m_cActiveRockets;
}*/
// Make sure that weapon animation matches what the game .dll is telling us
// over the wire ( fixes some animation glitches )
if( g_runfuncs && ( HUD_GetWeaponAnim() != to->client.weaponanim ) )
{
int body = 2;
/* //modif de Julien o para Julien, those cause compile-time errors and were not present here at the time.
//Pop the model to body 0.
if( pWeapon == &g_Tripmine )
body = 0;
//Show laser sight/scope combo
if( pWeapon == &g_Python && bIsMultiplayer() )
body = 1;
*/
// Force a fixed anim down to viewmodel
HUD_SendWeaponAnim( to->client.weaponanim, body, 1 );
}

74
cl_dll/hudzoom.cpp
View File

@ -210,28 +210,28 @@ int CHudSniper :: Init( void )
if ( ScreenWidth >= 1024 )
{
m_sprHG = SPR_Load("sprites/fsniper/fsniper_1024_up_l.SPR");
m_sprHG = SPR_Load("sprites/fsniper/fsniper_1024_up_l.spr");
if(!m_sprHG) m_sprHG = SPR_Load("sprites/fsniper/fsniper_1024_up_l.SPR");
m_sprH = SPR_Load("sprites/fsniper/fsniper_1024_up.SPR");
m_sprH = SPR_Load("sprites/fsniper/fsniper_1024_up.spr");
if(!m_sprH) m_sprH = SPR_Load("sprites/fsniper/fsniper_1024_up.SPR");
m_sprHD = SPR_Load("sprites/fsniper/fsniper_1024_up_r.SPR");
m_sprHD = SPR_Load("sprites/fsniper/fsniper_1024_up_r.spr");
if(!m_sprHD) m_sprHD = SPR_Load("sprites/fsniper/fsniper_1024_up_r.SPR");
m_sprBD = SPR_Load("sprites/fsniper/fsniper_1024_down_r.SPR");
m_sprBD = SPR_Load("sprites/fsniper/fsniper_1024_down_r.spr");
if(!m_sprBD) m_sprBD = SPR_Load("sprites/fsniper/fsniper_1024_down_r.SPR");
m_sprB = SPR_Load("sprites/fsniper/fsniper_1024_down.SPR");
m_sprB = SPR_Load("sprites/fsniper/fsniper_1024_down.spr");
if(!m_sprB) m_sprB = SPR_Load("sprites/fsniper/fsniper_1024_down.SPR");
m_sprBG = SPR_Load("sprites/fsniper/fsniper_1024_down_l.SPR");
m_sprBG = SPR_Load("sprites/fsniper/fsniper_1024_down_l.spr");
if(!m_sprBG) m_sprBG = SPR_Load("sprites/fsniper/fsniper_1024_down_l.SPR");
m_sprG = SPR_Load("sprites/fsniper/fsniper_1024_left.SPR");
m_sprG = SPR_Load("sprites/fsniper/fsniper_1024_left.spr");
if(!m_sprG) m_sprG = SPR_Load("sprites/fsniper/fsniper_1024_left.SPR");
m_sprD = SPR_Load("sprites/fsniper/fsniper_1024_right.SPR");
m_sprD = SPR_Load("sprites/fsniper/fsniper_1024_right.spr");
if(!m_sprD) m_sprD = SPR_Load("sprites/fsniper/fsniper_1024_right.SPR");
m_sprViseur = SPR_Load("sprites/fsniper/fsniper_1024_cross.SPR");
m_sprViseur = SPR_Load("sprites/fsniper/fsniper_1024_cross.spr");
if(!m_sprViseur) m_sprViseur = SPR_Load("sprites/fsniper/fsniper_1024_cross.SPR");
m_sprBlack = SPR_Load("sprites/fsniper/fsniper_black.SPR");
m_sprBlack = SPR_Load("sprites/fsniper/fsniper_black.spr");
if(!m_sprBlack) m_sprBlack = SPR_Load("sprites/fsniper/fsniper_black.SPR");
@ -245,13 +245,18 @@ int CHudSniper :: Init( void )
else /* if ( ScreenWidth <= 640 )*/
{
m_sprHG = SPR_Load("sprites/fsniper/fsniper_640_up_l.SPR");
m_sprHD = SPR_Load("sprites/fsniper/fsniper_640_up_r.SPR");
m_sprBD = SPR_Load("sprites/fsniper/fsniper_640_down_r.SPR");
m_sprBG = SPR_Load("sprites/fsniper/fsniper_640_down_l.SPR");
m_sprHG = SPR_Load("sprites/fsniper/fsniper_640_up_l.spr");
if(!m_sprHG) m_sprHG = SPR_Load("sprites/fsniper/fsniper_640_up_l.SPR");
m_sprHD = SPR_Load("sprites/fsniper/fsniper_640_up_r.spr");
if(!m_sprHD) m_sprHD = SPR_Load("sprites/fsniper/fsniper_640_up_r.SPR");
m_sprBD = SPR_Load("sprites/fsniper/fsniper_640_down_r.spr");
if(!m_sprBD) m_sprBD = SPR_Load("sprites/fsniper/fsniper_640_down_r.SPR");
m_sprBG = SPR_Load("sprites/fsniper/fsniper_640_down_l.spr");
if(!m_sprBG) m_sprBG = SPR_Load("sprites/fsniper/fsniper_640_down_l.SPR");
m_sprViseur = SPR_Load("sprites/fsniper/fsniper_640_cross.SPR");
m_sprBlack = SPR_Load("sprites/fsniper/fsniper_black.SPR");
m_sprViseur = SPR_Load("sprites/fsniper/fsniper_640_cross.spr");
if(!m_sprViseur) m_sprViseur = SPR_Load("sprites/fsniper/fsniper_640_cross.SPR");
m_sprBlack = SPR_Load("sprites/fsniper/fsniper_black.spr");
@ -282,28 +287,28 @@ int CHudSniper :: VidInit( void )
if ( ScreenWidth >= 1024 )
{
m_sprHG = SPR_Load("sprites/fsniper/fsniper_1024_up_l.SPR");
m_sprHG = SPR_Load("sprites/fsniper/fsniper_1024_up_l.spr");
if(!m_sprHG) m_sprHG = SPR_Load("sprites/fsniper/fsniper_1024_up_l.SPR");
m_sprH = SPR_Load("sprites/fsniper/fsniper_1024_up.SPR");
m_sprH = SPR_Load("sprites/fsniper/fsniper_1024_up.spr");
if(!m_sprH) m_sprH = SPR_Load("sprites/fsniper/fsniper_1024_up.SPR");
m_sprHD = SPR_Load("sprites/fsniper/fsniper_1024_up_r.SPR");
m_sprHD = SPR_Load("sprites/fsniper/fsniper_1024_up_r.spr");
if(!m_sprHD) m_sprHD = SPR_Load("sprites/fsniper/fsniper_1024_up_r.SPR");
m_sprBD = SPR_Load("sprites/fsniper/fsniper_1024_down_r.SPR");
m_sprBD = SPR_Load("sprites/fsniper/fsniper_1024_down_r.spr");
if(!m_sprBD) m_sprBD = SPR_Load("sprites/fsniper/fsniper_1024_down_r.SPR");
m_sprB = SPR_Load("sprites/fsniper/fsniper_1024_down.SPR");
m_sprB = SPR_Load("sprites/fsniper/fsniper_1024_down.spr");
if(!m_sprB) m_sprB = SPR_Load("sprites/fsniper/fsniper_1024_down.SPR");
m_sprBG = SPR_Load("sprites/fsniper/fsniper_1024_down_l.SPR");
m_sprBG = SPR_Load("sprites/fsniper/fsniper_1024_down_l.spr");
if(!m_sprBG) m_sprBG = SPR_Load("sprites/fsniper/fsniper_1024_down_l.SPR");
m_sprG = SPR_Load("sprites/fsniper/fsniper_1024_left.SPR");
m_sprG = SPR_Load("sprites/fsniper/fsniper_1024_left.spr");
if(!m_sprG) m_sprG = SPR_Load("sprites/fsniper/fsniper_1024_left.SPR");
m_sprD = SPR_Load("sprites/fsniper/fsniper_1024_right.SPR");
m_sprD = SPR_Load("sprites/fsniper/fsniper_1024_right.spr");
if(!m_sprD) m_sprD = SPR_Load("sprites/fsniper/fsniper_1024_right.SPR");
m_sprViseur = SPR_Load("sprites/fsniper/fsniper_1024_cross.SPR");
m_sprViseur = SPR_Load("sprites/fsniper/fsniper_1024_cross.spr");
if(!m_sprViseur) m_sprViseur = SPR_Load("sprites/fsniper/fsniper_1024_cross.SPR");
m_sprBlack = SPR_Load("sprites/fsniper/fsniper_black.SPR");
m_sprBlack = SPR_Load("sprites/fsniper/fsniper_black.spr");
if(!m_sprBlack) m_sprBlack = SPR_Load("sprites/fsniper/fsniper_black.SPR");
@ -317,13 +322,18 @@ int CHudSniper :: VidInit( void )
else /*if ( ScreenWidth <= 640 )*/
{
m_sprHG = SPR_Load("sprites/fsniper/fsniper_640_up_l.SPR");
m_sprHD = SPR_Load("sprites/fsniper/fsniper_640_up_r.SPR");
m_sprBD = SPR_Load("sprites/fsniper/fsniper_640_down_r.SPR");
m_sprBG = SPR_Load("sprites/fsniper/fsniper_640_down_l.SPR");
m_sprHG = SPR_Load("sprites/fsniper/fsniper_640_up_l.spr");
if(!m_sprHG) m_sprHG = SPR_Load("sprites/fsniper/fsniper_640_up_l.SPR");
m_sprHD = SPR_Load("sprites/fsniper/fsniper_640_up_r.spr");
if(!m_sprHD) m_sprHD = SPR_Load("sprites/fsniper/fsniper_640_up_r.SPR");
m_sprBD = SPR_Load("sprites/fsniper/fsniper_640_down_r.spr");
if(!m_sprBD) m_sprBD = SPR_Load("sprites/fsniper/fsniper_640_down_r.SPR");
m_sprBG = SPR_Load("sprites/fsniper/fsniper_640_down_l.spr");
if(!m_sprBG) m_sprBG = SPR_Load("sprites/fsniper/fsniper_640_down_l.SPR");
m_sprViseur = SPR_Load("sprites/fsniper/fsniper_640_cross.SPR");
m_sprBlack = SPR_Load("sprites/fsniper/fsniper_black.SPR");
m_sprViseur = SPR_Load("sprites/fsniper/fsniper_640_cross.spr");
if(!m_sprViseur) m_sprViseur = SPR_Load("sprites/fsniper/fsniper_640_cross.SPR");
m_sprBlack = SPR_Load("sprites/fsniper/fsniper_black.spr");

6
cl_dll/vgui_OrdiControl.cpp
View File

@ -162,7 +162,7 @@ COrdiControlPanel :: COrdiControlPanel(int iTrans, int iRemoveMe, int x,int y,in
#ifndef CRASHFIXPATH_INVASION_VGUI
m_pFleche[i] = new CImageLabel( "boutR", XRES ( 500 ), posY );
#else
m_pFleche[i] = new CommandButton( "R", XRES( 500 ), posY, XRES(20), YRES(20) );
m_pFleche[i] = new CommandButton( ">", XRES( 500 ), posY, XRES(20), YRES(20) );
#endif
m_pFleche[i]->setParent( m_pWindow );
#ifndef CRASHFIXPATH_INVASION_VGUI
@ -229,7 +229,7 @@ void COrdiControlPanel::Initialize( void )
m_pFleche[i]->m_pTGA = LoadTGA("boutR");
m_pFleche[i]->setImage( m_pFleche[i]->m_pTGA );
#else
m_pFleche[i]->setText("R");
m_pFleche[i]->setText(">");
#endif
}
else
@ -238,7 +238,7 @@ void COrdiControlPanel::Initialize( void )
m_pFleche[i]->m_pTGA = LoadTGA("boutL");
m_pFleche[i]->setImage( m_pFleche[i]->m_pTGA );
#else
m_pFleche[i]->setText("L");
m_pFleche[i]->setText("<");
#endif
}
}

3
cl_dll/vgui_OrdiMenu.cpp
View File

@ -569,7 +569,8 @@ void GetOrdiText ( const char *textname, char *messagename, Font *pRadioFont, in
fseek ( myfile, startoffset, SEEK_SET );
int i = 0; //Loop iterator fix. Must be outside of the loop to still be accessible afterwards.
int i = 0; //We need to declare this variable outside of the loop to keep it usable and visible, modif de Roy
for ( i=0; i<(int)(stopoffset-startoffset); i++ )
{
char copie = getc ( myfile );

16
dlls/cbase.cpp
View File

@ -772,15 +772,21 @@ CBaseEntity *CBaseEntity::Create( const char *szName, const Vector &vecOrigin, c
return pEntity;
}
//modif de Roy, we need to solve firing in Gaz non-virtual conundrum
//modif de Julien
//=========================================
// pour les trigger_gaz
//=========================================
//modif de Roy, we need to solve firing in Gaz non-virtual conundrum, so we move this function from CBasePlayer here, it will be inherited anyway.
BOOL CBaseEntity::IsInGaz ( void )
{
if( !IsPlayer()) return FALSE; //Quit immediately. This will always be true. CBaseEntity doesn't have an IsPlayer returning TRUE at all.
//Oh, but... CBasePlayer has!
//However, when combat.cpp calls this function, it calls this version, not the players, since the base function
//is for CBaseEntity, it simply asks it if it's the player (which is true in that case). Since it gets called without an actual pointer, it
//doesn't know which function to fire and does this one, not the player's (which inherits and overrides this function).
//So, if this one gets called in this context, IsPlayer is going to return TRUE, and then this fires up.
//So, since when combat.cpp calls this function, it calls this version, not the player's anyway, as the base function
//is for CBaseEntity, it simply asks it if it's the player (which is true in that case, as when the caller is actually
//CBasePlayer it will return TRUE for IsPlayer), but as it doesn't use pointers, it will call the CBaseEntity version.
//And we get FALSE, since the previous version only had actual code for the player, and always returned FALSE for
//CBaseEntity. So, instead we put all the code in CBaseEntity, make it always FALSE on IsPlayer call and let CBasePlayer
//simply inherit it and override IsPlayer with an always TRUE call.
Vector vecPlayer = Center ();

26
dlls/crowbar.cpp
View File

@ -28,34 +28,8 @@ extern void ClientDecal ( TraceResult *pTrace, Vector vecSrc, Vector vecEnd, int
#define CROWBAR_BODYHIT_VOLUME 128
#define CROWBAR_WALLHIT_VOLUME 512
class CCrowbar : public CBasePlayerWeapon
{
public:
void Spawn( void );
void Precache( void );
int iItemSlot( void ) { return 1; }
void EXPORT SwingAgain( void );
void EXPORT Smack( void );
int GetItemInfo(ItemInfo *p);
void PrimaryAttack( void );
int Swing( int fFirst );
BOOL Deploy( void );
void Holster( int skiplocal = 0 );
int m_iSwing;
TraceResult m_trHit;
Vector m_vecDecalSrc;
Vector m_vecDecalEnd;
// modif de julien
int AddToPlayer( CBasePlayer *pPlayer );
};
LINK_ENTITY_TO_CLASS( weapon_crowbar, CCrowbar );
enum gauss_e {
/* CROWBAR_IDLE = 0,
CROWBAR_DRAW,

44
dlls/diablo.cpp
View File

@ -15,7 +15,7 @@
//=====================================================
// Monster's anim events
// Constantes associées à plusieurs animations
// Constantes associ
//=====================================================
#define DIABLO_AE_KICK_NORMAL ( 1 )
@ -26,7 +26,7 @@
//=====================================================
// Schedule types :
// Attitudes à adopter spécifiques au Sniper
// Attitudes
//=====================================================
enum
{
@ -37,7 +37,7 @@ enum
//=====================================================
//Définition de la classe
//D
//=====================================================
@ -45,7 +45,7 @@ class CDiablo : public CBaseMonster
{
public:
void Spawn( void ); // initialisation
void Precache( void ); // on précache les sonds et les models
void Precache( void ); // on pr
void SetYawSpeed( void ); // vitesse de rotation
int Classify ( void ); // "camp" du monstre : alien ou humain
@ -66,7 +66,7 @@ public:
void TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType);
CUSTOM_SCHEDULES; // définit tous les array de comportements
CUSTOM_SCHEDULES; // d
//===
};
@ -99,7 +99,7 @@ void CDiablo :: SetYawSpeed ( void )
}
pev->yaw_speed = ys;*/
pev->yaw_speed = 64; // rotation en degrés par seconde
pev->yaw_speed = 64; // rotation en degr
}
@ -120,13 +120,13 @@ void CDiablo :: Spawn()
m_bloodColor = BLOOD_COLOR_YELLOW; // couleur du sang
pev->health = 200; // vie (plus tard avec le skill.cfg)
// pev->view_ofs = Vector ( 0, 0, 6 );// position of the eyes relative to monster's origin.
m_flFieldOfView = VIEW_FIELD_FULL; // cône de vision. full = max du max
m_flFieldOfView = VIEW_FIELD_FULL; // c
m_MonsterState = MONSTERSTATE_NONE;// ?
//=========
m_afCapability = bits_CAP_HEAR |
bits_CAP_RANGE_ATTACK1 | // capable d'entendre, et deux attaques
//bits_CAP_RANGE_ATTACK2 | // plus une de proximité
//bits_CAP_RANGE_ATTACK2 | // plus une de proximit
bits_CAP_MELEE_ATTACK1 |
bits_CAP_MELEE_ATTACK2 ;
pev->effects = 0; // pour le muzzleflash ?
@ -179,7 +179,7 @@ BOOL CDiablo :: CheckRangeAttack2 ( float flDot , float flDist )
BOOL CDiablo :: CheckMeleeAttack1 ( float flDot, float flDist )
{
if ( flDist <= 64 && flDot >= 0.7 && m_hEnemy != NULL && FBitSet ( m_hEnemy->pev->flags, FL_ONGROUND ) )
if ( flDist <= 64 && flDot >= 0.7 && m_hEnemy != 0 && FBitSet ( m_hEnemy->pev->flags, FL_ONGROUND ) )
{
return TRUE;
}
@ -189,7 +189,7 @@ BOOL CDiablo :: CheckMeleeAttack1 ( float flDot, float flDist )
BOOL CDiablo :: CheckMeleeAttack2 ( float flDot, float flDist )
{
if ( flDist <= 92 && flDot >= 0.7 && m_hEnemy != NULL && FBitSet ( m_hEnemy->pev->flags, FL_ONGROUND ) )
if ( flDist <= 92 && flDot >= 0.7 && m_hEnemy != 0 && FBitSet ( m_hEnemy->pev->flags, FL_ONGROUND ) )
{
return TRUE;
}
@ -204,21 +204,21 @@ CBaseEntity *CDiablo :: KickNormal( void )
{
TraceResult tr;
UTIL_MakeVectors( pev->angles ); // == démarrage du traçage du vecteur ==
UTIL_MakeVectors( pev->angles ); // == d
Vector vecStart = pev->origin; // le vecteur part de l'origine
vecStart.z += 42; // du monstre + 42 unités
vecStart.z += 42; // du monstre + 42 unit
// de haut
Vector vecEnd = vecStart + (gpGlobals->v_forward * 64); // jusqu'à 70 unités vers l'avant
Vector vecEnd = vecStart + (gpGlobals->v_forward * 64); // jusqu'
UTIL_TraceHull( vecStart, vecEnd, dont_ignore_monsters, head_hull, ENT(pev), &tr ); // on trace ce vecteur
if ( tr.pHit ) // ça touche quelqu'un ? un pointeur vers l'entité, svp !!
if ( tr.pHit ) //
{
CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit );
return pEntity;
}
return NULL; // si c'est un coup à côté, on en tient pas compte
return NULL; // si c'est un coup
}
@ -248,11 +248,11 @@ CBaseEntity *CDiablo :: KickLoin( void )
{
TraceResult tr;
UTIL_MakeVectors( pev->angles ); // == démarrage du traçage du vecteur ==
UTIL_MakeVectors( pev->angles ); // == d
Vector vecStart = pev->origin; // le vecteur part de l'origine
vecStart.z += 42; // du monstre + 42 unités
vecStart.z += 42; // du monstre + 42 unit
// de haut
Vector vecEnd = vecStart + (gpGlobals->v_forward * 92); // jusqu'à 70 unités vers l'avant
Vector vecEnd = vecStart + (gpGlobals->v_forward * 92); // jusqu'
UTIL_TraceHull( vecStart, vecEnd, dont_ignore_monsters, head_hull, ENT(pev), &tr ); // on trace ce vecteur
@ -310,14 +310,14 @@ void CDiablo :: TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecD
if ( ptr->iHitgroup != 2 ) // le tir n'est pas dans l'oeil
{
flDamage -= 30; // absorbe les dommages
if (flDamage <= 0) // aucun dégat si le tir est de - de 20 pts
if (flDamage <= 0) // aucun d
{
UTIL_Ricochet( ptr->vecEndPos, 1.0 );
flDamage = 0;
}
}
else
{ ALERT ( at_console , "DANS L'OEIL !!!!\n" ); } // à virer
{ ALERT ( at_console , "DANS L'OEIL !!!!\n" ); } //
CBaseMonster::TraceAttack( pevAttacker, flDamage, vecDir, ptr, bitsDamageType );
}
@ -328,7 +328,7 @@ void CDiablo :: TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecD
//================================================
// Handle Anim Event :
// évènements durant les anims
//
//================================================
void CDiablo :: HandleAnimEvent( MonsterEvent_t *pEvent )
@ -413,7 +413,7 @@ Task_t tlDiabloRangeAttack1[] =
{
{ TASK_SET_FAIL_SCHEDULE, (float)SCHED_TAKE_COVER_FROM_ENEMY },// S'il ne peut pas aller vers le joueur
{ TASK_GET_PATH_TO_ENEMY, (float)0 }, // localise l'ennemi, trace un chemin,
{ TASK_RUN_PATH, (float)0 }, // se prépare à courir
{ TASK_RUN_PATH, (float)0 }, // se pr
{ TASK_WAIT_FOR_MOVEMENT, (float)0 }, // et se lance
};

2
dlls/doors.cpp
View File

@ -1136,7 +1136,7 @@ void CMomentaryDoor :: Blocked( CBaseEntity *pOther )
if ( FClassnameIs( pentCherche, "momentary_rot_button" ) ) //"momentary_door" ) )
{
CBaseEntity* pDoor = CBaseEntity :: Instance ( pentCherche );
pDoor->pev->target = NULL;
pDoor->pev->target = 0;
}
}

6
dlls/flybee.cpp
View File

@ -844,7 +844,7 @@ void CFlybee :: RunTask ( Task_t *pTask )
switch ( pTask->iTask )
{
case TASK_FLYBEE_CIRCLE_ENEMY:
if (m_hEnemy == NULL)
if (m_hEnemy == 0)
{
TaskComplete( );
}
@ -1333,7 +1333,7 @@ Vector CFlybee::DoProbe(const Vector &Probe)
}
}
if (bBumpedSomething && (m_hEnemy == NULL || tr.pHit != m_hEnemy->edict()))
if (bBumpedSomething && (m_hEnemy == 0 || tr.pHit != m_hEnemy->edict()))
{
Vector ProbeDir = Probe - pev->origin;
@ -1420,7 +1420,7 @@ void CFlyBall :: Spawn( void )
pev->velocity = gpGlobals->v_forward * 1000;
m_flFieldOfView = -1;
m_hEnemy = NULL;
m_hEnemy = 0;
}
int CFlyBall::Classify ( void )

20
dlls/handgrenade.cpp
View File

@ -35,26 +35,6 @@ enum handgrenade_e {
};
class CHandGrenade : public CBasePlayerWeapon
{
public:
void Spawn( void );
void Precache( void );
int iItemSlot( void ) { return 5; }
int GetItemInfo(ItemInfo *p);
void PrimaryAttack( void );
BOOL Deploy( void );
BOOL CanHolster( void );
void Holster( int skiplocal = 0 );
void WeaponIdle( void );
float m_flStartThrow;
float m_flReleaseThrow;
// modif de julien
int AddToPlayer( CBasePlayer *pPlayer );
};
LINK_ENTITY_TO_CLASS( weapon_handgrenade, CHandGrenade );

8
dlls/luciole.cpp
View File

@ -415,7 +415,7 @@ void CLuciole :: StartTask ( Task_t *pTask )
{
entvars_t *pevCover;
if ( m_hEnemy == NULL )
if ( m_hEnemy == 0 )
{
// Find cover from self if no enemy available
pevCover = pev;
@ -484,7 +484,7 @@ void CLuciole :: RunTask ( Task_t *pTask )
// position de tir
if ( m_hEnemy != NULL && (Center()-m_hEnemy->Center()).Length() < ATTACK_DIST && gpGlobals->time - m_flLastAttack > ATTACK_DELAY )
if ( m_hEnemy != 0 && (Center()-m_hEnemy->Center()).Length() < ATTACK_DIST && gpGlobals->time - m_flLastAttack > ATTACK_DELAY )
{
m_flLastAttack = gpGlobals->time;
@ -551,7 +551,7 @@ void CLuciole :: RunTask ( Task_t *pTask )
// actualise la position ennemie
if ( m_hEnemy == NULL )
if ( m_hEnemy == 0 )
{
TaskComplete ();
break;
@ -1066,7 +1066,7 @@ void CLuciole :: ReorganiseSquad ( void )
UTIL_ParticleEffect ( pev->origin, Vector(90,0,0), 0x0000FF, 128 );
#endif
if ( m_hEnemy == NULL )
if ( m_hEnemy == 0 )
{
#if defined DEBUG_ALERTS
ALERT ( at_console, "pas d'ennemi pour la reorganisation\n" );

21
dlls/mp5.cpp
View File

@ -35,27 +35,6 @@ enum mp5_e
MP5_FIRE3,
};
class CMP5 : public CBasePlayerWeapon
{
public:
void Spawn( void );
void Precache( void );
int iItemSlot( void ) { return 3; }
int GetItemInfo(ItemInfo *p);
int AddToPlayer( CBasePlayer *pPlayer );
void PrimaryAttack( void );
// void SecondaryAttack( void ); //dans le M16
// int SecondaryAmmoIndex( void );
BOOL Deploy( void );
void Reload( void );
void WeaponIdle( void );
float m_flNextAnimTime;
int m_iShell;
private:
unsigned short m_usMP5;
};
LINK_ENTITY_TO_CLASS( weapon_mp5, CMP5 );
LINK_ENTITY_TO_CLASS( weapon_9mmAR, CMP5 );

36
dlls/player.cpp
View File

@ -5412,42 +5412,6 @@ void CInfoIntermission::Think( void )
}
LINK_ENTITY_TO_CLASS( info_intermission, CInfoIntermission )
//modif de Julien
//=========================================
// pour les trigger_gaz
//=========================================
/*BOOL CBasePlayer::IsInGaz ( void )
{
Vector vecPlayer = Center ();
CBaseEntity *pFind = NULL;
edict_t *pTrigger = NULL;
pTrigger = FIND_ENTITY_BY_CLASSNAME( NULL, "trigger_gaz" );
while ( !FNullEnt ( pTrigger ) )
{
pFind = CBaseEntity::Instance ( pTrigger );
if ( vecPlayer.x > pFind->pev->absmin.x && vecPlayer.x < pFind->pev->absmax.x &&
vecPlayer.y > pFind->pev->absmin.y && vecPlayer.y < pFind->pev->absmax.y &&
vecPlayer.z > pFind->pev->absmin.z && vecPlayer.z < pFind->pev->absmax.z ) // Player est ds le trigger
{
return TRUE;
}
else
{
pTrigger = FIND_ENTITY_BY_CLASSNAME( pTrigger, "trigger_gaz" );
}
}
return FALSE;
}*/
//modif de Julien
//=====================================

1
dlls/player.h
View File

@ -353,7 +353,6 @@ public:
// Night Vision Google
//BOOL IsInGaz ( void ); //Must NOT be virtual, causes "unimplemented symbol" error in game.
void ShowVGUIordiMenu( int iparam1, int iparam2, int iparam3 );
void ThinkNVG ( void );

24
dlls/python.cpp
View File

@ -43,28 +43,6 @@ enum python_e {
PYTHON_RELOAD
};
class CPython : public CBasePlayerWeapon
{
public:
void Spawn( void );
void Precache( void );
int iItemSlot( void ) { return 2; }
int GetItemInfo(ItemInfo *p);
int AddToPlayer( CBasePlayer *pPlayer );
void PrimaryAttack( void );
// void SecondaryAttack( void );
BOOL Deploy( void );
void Holster( int skiplocal = 0 );
void Reload( void );
void WeaponIdle( void );
float m_flSoundDelay;
// BOOL m_fInZoom;// don't save this.
private:
unsigned short m_usFirePython;
int m_iShell;
};
LINK_ENTITY_TO_CLASS( weapon_python, CPython );
LINK_ENTITY_TO_CLASS( weapon_357, CPython );
@ -188,7 +166,7 @@ void CPython::PrimaryAttack()
m_iClip--;
// PLAYBACK_EVENT( 0, m_pPlayer->edict(), m_usFirePython ); // le full permet de préciser le param1
// PLAYBACK_EVENT( 0, m_pPlayer->edict(), m_usFirePython ); // le full permet de pr
PLAYBACK_EVENT_FULL( 0, m_pPlayer->edict(), m_usFirePython, 0, (float *)&g_vecZero, (float *)&g_vecZero, 0.0, 0.0, 0, 0, ( m_iClip == 0 ) ? 1 : 0, 0 );
m_pPlayer->m_iWeaponVolume = LOUD_GUN_VOLUME;

8
dlls/radiomsg.cpp
View File

@ -20,6 +20,8 @@
#include "player.h"
#include "gamerules.h"
#include "../cl_dll/crutches.h" //Needed to treat radio messages being one symbol too short modif de Roy
extern int gmsgRadioMsg;
@ -84,8 +86,12 @@ int GetRadiomsgText ( int iszMessage )
fseek ( myfile, startoffset, SEEK_SET );
int i = 0; //Loop iterator fix. Must be outside of the loop to still be accessible afterwards.
int i = 0; //We need to declare this variable outside of the loop to keep it usable and visible, modif de Roy
#ifndef RADIOMSGCUTSHORTFIX_INVASION_DLL
for ( i=0; i<(int)(stopoffset-startoffset); i++ )
#else
for ( i=0; i<(int)(stopoffset-startoffset)+1; i++ ) //Added +1, stopoffset seems to be too low.
#endif
{
messagetext [i] = getc ( myfile );
}

6
dlls/rpggrunt.cpp
View File

@ -493,7 +493,7 @@ void CRpggrunt :: HandleAnimEvent( MonsterEvent_t *pEvent )
void CRpggrunt :: Shoot ( void )
{
if (m_hEnemy == NULL)
if (m_hEnemy == 0)
{
return;
}
@ -834,7 +834,7 @@ void CRpggrunt :: RunTask ( Task_t *pTask )
}
case TASK_RPG_FIRE:
{
if (m_hEnemy != NULL)
if (m_hEnemy != 0)
{
Vector vecShootDir = m_hEnemy->Center() - Center();
Vector angDir = UTIL_VecToAngles( vecShootDir );
@ -1172,7 +1172,7 @@ Schedule_t *CRpggrunt :: GetSchedule( void )
{
int iPercent = RANDOM_LONG(0,99);
if ( iPercent <= 75 && m_hEnemy != NULL )
if ( iPercent <= 75 && m_hEnemy != 0 )
{
ClearConditions( bits_COND_LIGHT_DAMAGE );

39
dlls/shotgun.cpp
View File

@ -37,47 +37,8 @@ enum shotgun_e {
SHOTGUN_PUMP
};
/*class CShotgun : public CBasePlayerWeapon
{
public:
int Save( CSave &save );
int Restore( CRestore &restore );
static TYPEDESCRIPTION m_SaveData[];
void Spawn( void );
void Precache( void );
int iItemSlot( ) { return 3; }
int GetItemInfo(ItemInfo *p);
int AddToPlayer( CBasePlayer *pPlayer );
void PrimaryAttack( void );
void SecondaryAttack( void );
BOOL Deploy( );
void Reload( void );
void WeaponIdle( void );
int m_fInReload;
float m_flNextReload;
int m_iShell;
float m_flPumpTime;
private:
unsigned short m_usDoubleFire;
unsigned short m_usSingleFire;
};*/
LINK_ENTITY_TO_CLASS( weapon_shotgun, CShotgun );
/*TYPEDESCRIPTION CShotgun::m_SaveData[] =
{
DEFINE_FIELD( CShotgun, m_flNextReload, FIELD_TIME ),
DEFINE_FIELD( CShotgun, m_fInReload, FIELD_INTEGER ),
DEFINE_FIELD( CShotgun, m_flNextReload, FIELD_TIME ),
// DEFINE_FIELD( CShotgun, m_iShell, FIELD_INTEGER ),
DEFINE_FIELD( CShotgun, m_flPumpTime, FIELD_TIME ),
};
IMPLEMENT_SAVERESTORE( CShotgun, CBasePlayerWeapon );*/
void CShotgun::Spawn( )
{
Precache( );

9
dlls/sniper.cpp
View File

@ -195,7 +195,7 @@ void CSniper :: Precache()
void CSniper :: Shoot ( void )
{
if (m_hEnemy == NULL)
if (m_hEnemy == 0)
{
return;
}
@ -421,7 +421,7 @@ BOOL CSniper :: CheckMeleeAttack1 ( float flDot, float flDist )
{
CBaseMonster *pEnemy;
if ( m_hEnemy != NULL )
if ( m_hEnemy != 0 )
{
pEnemy = m_hEnemy->MyMonsterPointer();
@ -497,7 +497,7 @@ void CSniper :: RunTask ( Task_t *pTask )
{
case TASK_RANGE_ATTACK1:
{
if (m_hEnemy != NULL)
if (m_hEnemy != 0)
{
Vector vecShootDir = m_hEnemy->Center() - Center();
Vector angDir = UTIL_VecToAngles( vecShootDir );
@ -623,12 +623,13 @@ IMPLEMENT_CUSTOM_SCHEDULES( CSniper, CBaseMonster );
// Gestion des comportements
//----------------------------------------------------
#define NEER_GONNA_HAPPEN 677 //Just some obnoxiously high value, see below, modif de Roy
Schedule_t *CSniper :: GetSchedule( void )
{
switch ( m_MonsterState )
{
case NEER_GONNA_HAPPEN: //Since MONSTERSTATE is an enum, this will never be executed (and so it wasn't in the original Julien's code), but we will satisfy the compiler, and it will hopefully not be angry at us, modif de Roy
if ( HasConditions(bits_COND_HEAR_SOUND) )
{
CSound *pSound = PBestSound();

8
dlls/supergun.cpp
View File

@ -156,7 +156,7 @@ void CSGBall :: Spawn( void )
pev->velocity = gpGlobals->v_forward * 1700;
m_flFieldOfView = -1;
m_hEnemy = NULL;
m_hEnemy = 0;
}
int CSGBall::Classify ( void )
@ -207,13 +207,13 @@ void CSGBall :: AnimateThink( void )
// ennemi
if ( m_hEnemy == NULL )
if ( m_hEnemy == 0 )
{
Look( 600 );
m_hEnemy = BestVisibleEnemy( );
}
if ( m_hEnemy != NULL && FVisible( m_hEnemy ))
if ( m_hEnemy != 0 && FVisible( m_hEnemy ))
{
Vector vecDirToEnemy = ( m_hEnemy->BodyTarget( pev->origin ) - pev->origin ).Normalize();
@ -230,7 +230,7 @@ void CSGBall :: AnimateThink( void )
}
else
{
m_hEnemy = NULL;
m_hEnemy = 0;
}

2
dlls/tank.cpp
View File

@ -1335,7 +1335,7 @@ void CTank :: Fire ( int canon )
::RadiusDamage( tr.vecEndPos, pev, pev, 300, 300, CLASS_NONE, DMG_BLAST );
//effet de fum
EnvSmokeCreate( tr.vecEndPos, 4, 10, 2, NULL );
EnvSmokeCreate( tr.vecEndPos, 4, 10, 2, 0 );
/* // sprites de feu

8
dlls/util.cpp
View File

@ -1515,13 +1515,15 @@ void UTIL_BubbleTrail( Vector from, Vector to, int count )
extern DLL_GLOBAL short g_sModelIndexBlastCircle; // sprite de l'onde de choc
void UTIL_WaterWave ( Vector origin )
void UTIL_WaterWave ( Vector origin ) //modif de Roy
{
return; //Remove this until we can f-ix it.
//ifdef WATERWAVENONFIX_INVASION_DLL
return; //Remove this until we can solve this. Just quit-out for now.
//endif
// ALERT( at_console, "Emitting waves CLIENT %f %f %f \n", origin.x, origin.y, origin.z );
// MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, NULL ); //This doesn't work, the origin seems almost random.
// MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY ); //This works, but the actual sprite is an ugly triangle.
MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, origin ); //This works, but the actual sprite is f-ed.
MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, origin ); //This works, but the actual sprite is screwed (an ugly semi-triangle).
WRITE_BYTE( TE_BEAMTORUS/*TE_BEAMCYLINDER*/ );
WRITE_COORD( origin.x);
WRITE_COORD( origin.y);

35
dlls/weapons.cpp
View File

@ -598,26 +598,7 @@ TYPEDESCRIPTION CBasePlayerItem::m_SaveData[] =
IMPLEMENT_SAVERESTORE( CBasePlayerItem, CBaseAnimating )
/*TYPEDESCRIPTION CBasePlayerWeapon::m_SaveData[] =
{
#if CLIENT_WEAPONS
DEFINE_FIELD( CBasePlayerWeapon, m_flNextPrimaryAttack, FIELD_FLOAT ),
DEFINE_FIELD( CBasePlayerWeapon, m_flNextSecondaryAttack, FIELD_FLOAT ),
DEFINE_FIELD( CBasePlayerWeapon, m_flTimeWeaponIdle, FIELD_FLOAT ),
#else // CLIENT_WEAPONS
DEFINE_FIELD( CBasePlayerWeapon, m_flNextPrimaryAttack, FIELD_TIME ),
DEFINE_FIELD( CBasePlayerWeapon, m_flNextSecondaryAttack, FIELD_TIME ),
DEFINE_FIELD( CBasePlayerWeapon, m_flTimeWeaponIdle, FIELD_TIME ),
#endif // CLIENT_WEAPONS
DEFINE_FIELD( CBasePlayerWeapon, m_iPrimaryAmmoType, FIELD_INTEGER ),
DEFINE_FIELD( CBasePlayerWeapon, m_iSecondaryAmmoType, FIELD_INTEGER ),
DEFINE_FIELD( CBasePlayerWeapon, m_iClip, FIELD_INTEGER ),
DEFINE_FIELD( CBasePlayerWeapon, m_iDefaultAmmo, FIELD_INTEGER ),
//DEFINE_FIELD( CBasePlayerWeapon, m_iClientClip, FIELD_INTEGER ), reset to zero on load so hud gets updated correctly
//DEFINE_FIELD( CBasePlayerWeapon, m_iClientWeaponState, FIELD_INTEGER ), reset to zero on load so hud gets updated correctly
};*/
TYPEDESCRIPTION CBasePlayerWeapon::m_SaveData[] =
TYPEDESCRIPTION CBasePlayerWeapon::m_SaveData[] = //modif de Julien, restore version from the previous SDK version
{
DEFINE_FIELD( CBasePlayerWeapon, m_flNextPrimaryAttack, FIELD_TIME ),
DEFINE_FIELD( CBasePlayerWeapon, m_flNextSecondaryAttack, FIELD_TIME ),
@ -816,11 +797,6 @@ BOOL CanAttack( float attack_time, float curtime, BOOL isPredicted )
void CBasePlayerWeapon::ItemPostFrame( void )
{
/* if(m_pPlayer->m_iDrivingTank!=FALSE){ //modif de Roy we need to fix that
WeaponIdle();
m_flLastFireTime = 10.0f;
return;
}*/
if( ( m_fInReload ) && ( m_pPlayer->m_flNextAttack <= UTIL_WeaponTimeBase() ) )
{
// complete the reload.
@ -1803,15 +1779,6 @@ void CBasePlayerWeapon::PrintState( void )
ALERT( at_console, "m_iclip: %i\n", m_iClip );
}
/*TYPEDESCRIPTION CShotgun::m_SaveData[] = //ARRR
{
DEFINE_FIELD( CShotgun, m_flNextReload, FIELD_TIME ),
DEFINE_FIELD( CShotgun, m_fInSpecialReload, FIELD_INTEGER ),
// DEFINE_FIELD( CShotgun, m_iShell, FIELD_INTEGER ),
DEFINE_FIELD( CShotgun, m_flPumpTime, FIELD_TIME ),
};
IMPLEMENT_SAVERESTORE( CShotgun, CBasePlayerWeapon )*/
TYPEDESCRIPTION CShotgun::m_SaveData[] =
{
DEFINE_FIELD( CShotgun, m_fInReload, FIELD_INTEGER ),

109
dlls/weapons.h
View File

@ -563,7 +563,7 @@ private:
unsigned short m_usFireGlock2;
};
/*class CCrowbar : public CBasePlayerWeapon //Restored to old version to fix animation modif de Roy
class CCrowbar : public CBasePlayerWeapon
{
public:
void Spawn( void );
@ -571,16 +571,12 @@ public:
int iItemSlot( void ) { return 1; }
void EXPORT SwingAgain( void );
void EXPORT Smack( void );
int GetItemInfo( ItemInfo *p );
//int AddToPlayer( CBasePlayer *pPlayer );
int GetItemInfo(ItemInfo *p);
void PrimaryAttack( void );
int Swing( int fFirst );
BOOL Deploy( void );
void Holster( int skiplocal = 0 );
#if CROWBAR_IDLE_ANIM
void WeaponIdle();
#endif
int m_iSwing;
TraceResult m_trHit;
@ -590,20 +586,9 @@ public:
// modif de julien
int AddToPlayer( CBasePlayer *pPlayer );
};
virtual BOOL UseDecrement( void )
{
#if CLIENT_WEAPONS
return TRUE;
#else
return FALSE;
#endif
}
private:
unsigned short m_usCrowbar;
};*/
/*class CPython : public CBasePlayerWeapon //Restored to old version to fix animation modif de Roy
class CPython : public CBasePlayerWeapon
{
public:
void Spawn( void );
@ -620,22 +605,13 @@ public:
float m_flSoundDelay;
// BOOL m_fInZoom;// don't save this.
int m_iShell;
virtual BOOL UseDecrement( void )
{
#if CLIENT_WEAPONS
return TRUE;
#else
return FALSE;
#endif
}
private:
unsigned short m_usFirePython;
};*/
int m_iShell;
/*class CMP5 : public CBasePlayerWeapon //Restored to old version to fix animation modif de Roy
};
class CMP5 : public CBasePlayerWeapon
{
public:
void Spawn( void );
@ -652,20 +628,9 @@ public:
void WeaponIdle( void );
float m_flNextAnimTime;
int m_iShell;
virtual BOOL UseDecrement( void )
{
#if CLIENT_WEAPONS
return TRUE;
#else
return FALSE;
#endif
}
private:
unsigned short m_usMP5;
unsigned short m_usMP52;
};*/
};
class CCrossbow : public CBasePlayerWeapon
{
@ -701,44 +666,6 @@ private:
unsigned short m_usCrossbow2;
};
/*class CShotgun : public CBasePlayerWeapon //Restored to old version to fix animation modif de Roy
{
public:
#if !CLIENT_DLL
int Save( CSave &save );
int Restore( CRestore &restore );
static TYPEDESCRIPTION m_SaveData[];
#endif
void Spawn( void );
void Precache( void );
int iItemSlot( ) { return 3; }
int GetItemInfo(ItemInfo *p);
int AddToPlayer( CBasePlayer *pPlayer );
void PrimaryAttack( void );
void SecondaryAttack( void );
BOOL Deploy( );
void Reload( void );
void WeaponIdle( void );
void ItemPostFrame( void );
int m_fInReload;
float m_flNextReload;
int m_iShell;
virtual BOOL UseDecrement( void )
{
#if CLIENT_WEAPONS
return TRUE;
#else
return FALSE;
#endif
}
private:
unsigned short m_usDoubleFire;
unsigned short m_usSingleFire;
};*/
class CShotgun : public CBasePlayerWeapon
{
public:
@ -994,7 +921,7 @@ private:
unsigned short m_usHornetFire;
};
/*class CHandGrenade : public CBasePlayerWeapon //Restored to old version to fix animation modif de Roy
class CHandGrenade : public CBasePlayerWeapon
{
public:
void Spawn( void );
@ -1007,19 +934,13 @@ public:
BOOL CanHolster( void );
void Holster( int skiplocal = 0 );
void WeaponIdle( void );
virtual BOOL UseDecrement( void )
{
#if CLIENT_WEAPONS
return TRUE;
#else
return FALSE;
#endif
}
float m_flStartThrow;
float m_flReleaseThrow;
// modif de julien
int AddToPlayer( CBasePlayer *pPlayer ); //added by Roy
};*/
int AddToPlayer( CBasePlayer *pPlayer );
};
class CSatchel : public CBasePlayerWeapon
{