Skip to content

Commit

Permalink
sources
Browse files Browse the repository at this point in the history
  • Loading branch information
stamepicmorg committed Jan 21, 2016
1 parent 378989b commit 25dc354
Show file tree
Hide file tree
Showing 59 changed files with 2,641 additions and 3,647 deletions.
4 changes: 2 additions & 2 deletions dlls/agrunt.cpp
Expand Up @@ -15,7 +15,7 @@
//=========================================================
// Agrunt - Dominant, warlike alien grunt monster
//=========================================================

/*
#include "extdll.h"
#include "util.h"
#include "cbase.h"
Expand Down Expand Up @@ -1183,4 +1183,4 @@ Schedule_t* CAGrunt :: GetScheduleOfType ( int Type )
return CSquadMonster :: GetScheduleOfType( Type );
}

*/
28 changes: 7 additions & 21 deletions dlls/apache.cpp
Expand Up @@ -12,6 +12,7 @@
* use or distribution of this code by or to any unlicensed person is illegal.
*
****/
/*
#ifndef OEM_BUILD
#include "extdll.h"
Expand Down Expand Up @@ -294,17 +295,7 @@ void CApache :: DyingThink( void )
{
Vector vecSpot = pev->origin + (pev->mins + pev->maxs) * 0.5;
/*
MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
WRITE_BYTE( TE_EXPLOSION); // This just makes a dynamic light now
WRITE_COORD( vecSpot.x );
WRITE_COORD( vecSpot.y );
WRITE_COORD( vecSpot.z + 300 );
WRITE_SHORT( g_sModelIndexFireball );
WRITE_BYTE( 250 ); // scale * 10
WRITE_BYTE( 8 ); // framerate
MESSAGE_END();
*/
// fireball
MESSAGE_BEGIN( MSG_PVS, SVC_TEMPENTITY, vecSpot );
Expand Down Expand Up @@ -354,7 +345,7 @@ void CApache :: DyingThink( void )
RadiusDamage( pev->origin, pev, pev, 300, CLASS_NONE, DMG_BLAST );
if (/*!(pev->spawnflags & SF_NOWRECKAGE) && */(pev->flags & FL_ONGROUND))
if ((pev->flags & FL_ONGROUND))
{
CBaseEntity *pWreckage = Create( "cycler_wreckage", pev->origin, pev->angles );
// SET_MODEL( ENT(pWreckage->pev), STRING(pev->model) );
Expand Down Expand Up @@ -676,7 +667,7 @@ void CApache :: Flight( void )
}
// pitch forward or back to get to target
if (flDist > 0 && flSpeed < m_flGoalSpeed /* && flSpeed < flDist */ && pev->angles.x + pev->avelocity.x > -40)
if (flDist > 0 && flSpeed < m_flGoalSpeed && pev->angles.x + pev->avelocity.x > -40)
{
// ALERT( at_console, "F " );
// lean forward
Expand Down Expand Up @@ -896,13 +887,7 @@ int CApache :: TakeDamage( entvars_t* pevInflictor, entvars_t* pevAttacker, floa
flDamage *= 2;
}
/*
if ( (bitsDamageType & DMG_BULLET) && flDamage > 50)
{
// clip bullet damage at 50
flDamage = 50;
}
*/
// ALERT( at_console, "%.0f\n", flDamage );
return CBaseEntity::TakeDamage( pevInflictor, pevAttacker, flDamage, bitsDamageType );
Expand Down Expand Up @@ -1047,4 +1032,5 @@ void CApacheHVR :: AccelerateThink( void )
}
#endif
#endif
*/
3 changes: 2 additions & 1 deletion dlls/barnacle.cpp
Expand Up @@ -15,7 +15,7 @@
//=========================================================
// barnacle - stationary ceiling mounted 'fishing' monster
//=========================================================

/*
#include "extdll.h"
#include "util.h"
#include "cbase.h"
Expand Down Expand Up @@ -427,3 +427,4 @@ CBaseEntity *CBarnacle :: TongueTouchEnt ( float *pflLength )
return NULL;
}
*/
4 changes: 2 additions & 2 deletions dlls/bigmomma.cpp
Expand Up @@ -601,7 +601,7 @@ int CBigMomma :: TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, fl

void CBigMomma :: LayHeadcrab( void )
{
CBaseEntity *pChild = CBaseEntity::Create( BIG_CHILDCLASS, pev->origin, pev->angles, edict() );
/* CBaseEntity *pChild = CBaseEntity::Create( BIG_CHILDCLASS, pev->origin, pev->angles, edict() );
pChild->pev->spawnflags |= SF_MONSTER_FALL_TO_GROUND;
Expand All @@ -622,7 +622,7 @@ void CBigMomma :: LayHeadcrab( void )
UTIL_DecalTrace( &tr, DECAL_MOMMABIRTH );
EMIT_SOUND_DYN( edict(), CHAN_WEAPON, RANDOM_SOUND_ARRAY(pBirthSounds), 1.0, ATTN_NORM, 0, 100 + RANDOM_LONG(-5,5) );
m_crabCount++;
m_crabCount++; */
}


Expand Down
3 changes: 2 additions & 1 deletion dlls/bloater.cpp
Expand Up @@ -15,7 +15,7 @@
//=========================================================
// Bloater
//=========================================================

/*
#include "extdll.h"
#include "util.h"
#include "cbase.h"
Expand Down Expand Up @@ -217,3 +217,4 @@ void CBloater :: Precache()
// AI Schedules Specific to this monster
//=========================================================
*/
5 changes: 4 additions & 1 deletion dlls/cbase.h
Expand Up @@ -138,7 +138,8 @@ class CBaseEntity
public:
float FTime1; //player freeze
float FTime2; //monsters freeze

short m_LaserSprite2;
short m_iSpriteTexture_s;

void TeslaExplode( CBaseEntity *pEntity, Vector vecSrc, entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, float flRadius, int iClassIgnore, int bitsDamageType );

Expand Down Expand Up @@ -377,6 +378,8 @@ class CBaseEntity
int m_fireState;

int m_type; //two types of think's: freeze|explode


};


Expand Down
34 changes: 15 additions & 19 deletions dlls/client.cpp
Expand Up @@ -406,8 +406,8 @@ void ClientCommand( edict_t *pEntity )
{
if ( g_flWeaponCheat != 0.0)
{
//int iszItem = ALLOC_STRING( CMD_ARGV(1) ); // Make a copy of the classname
//GetClassPtr((CBasePlayer *)pev)->GiveNamedItem( STRING(iszItem) );
int iszItem = ALLOC_STRING( CMD_ARGV(1) ); // Make a copy of the classname
GetClassPtr((CBasePlayer *)pev)->GiveNamedItem( STRING(iszItem) );
}
}

Expand Down Expand Up @@ -634,10 +634,7 @@ void PlayerPostThink( edict_t *pEntity )
//entvars_t *pev = &pEntity->v;
CBasePlayer *pPlayer = (CBasePlayer *)GET_PRIVATE(pEntity);

if ( pPlayer==NULL )
return;

if (pPlayer != NULL)
if (pPlayer)
pPlayer->PostThink( );
}

Expand Down Expand Up @@ -678,6 +675,7 @@ void ClientPrecache( void )
{
// setup precaches always needed
PRECACHE_SOUND("player/sprayer.wav"); // spray paint sound for PreAlpha
PRECACHE_SOUND("zxc/sprayer.wav"); // spray paint sound 2
PRECACHE_SOUND("debris/beamstart8b.wav");
// PRECACHE_SOUND("player/pl_jumpland2.wav"); // UNDONE: play 2x step sound

Expand Down Expand Up @@ -802,7 +800,7 @@ const char *GetGameDescription()
if ( g_pGameRules ) // this function may be called before the world has spawned, and the game rules initialized
return g_pGameRules->GetGameDescription();
else
return "Half-Life zxc mod 1.32";
return "Half-Life zxc mod 1.33";
}

/*
Expand Down Expand Up @@ -1451,21 +1449,21 @@ void RegisterEncoders( void )
//debugger found it as reason of crash, close code
int GetWeaponData( struct edict_s *player, struct weapon_data_s *info )
{
/*
//int i;
//weapon_data_t *item;
#if defined( CLIENT_WEAPONS )
int i;
weapon_data_t *item;
entvars_t *pev = &player->v;
CBasePlayer *pl = ( CBasePlayer *) CBasePlayer::Instance( pev );
//CBasePlayerWeapon *gun;
CBasePlayerWeapon *gun;

//ItemInfo II;
ItemInfo II;

memset( info, 0, 32 * sizeof( weapon_data_t ) );

if ( !pl )
return 1;

// go through all of the weapons and make a list of the ones to pack
// go through all of the weapons and make a list of the ones to pack
for ( i = 0 ; i < MAX_ITEM_TYPES ; i++ )
{
if ( pl->m_rgpPlayerItems[ i ] )
Expand All @@ -1489,10 +1487,9 @@ int GetWeaponData( struct edict_s *player, struct weapon_data_s *info )
item->m_iId = II.iId;
item->m_iClip = gun->m_iClip;

//item->m_flTimeWeaponIdle = max( gun->m_flTimeWeaponIdle, -0.001 ); // remov
item->m_flTimeWeaponIdle = max( gun->m_flTimeWeaponIdle, -0.001 );
item->m_flNextPrimaryAttack = max( gun->m_flNextPrimaryAttack, -0.001 );
item->m_flNextSecondaryAttack = max( gun->m_flNextSecondaryAttack, -0.001 );
//item->m_flNextThirdAttack = max( gun->m_flNextThirdAttack, -0.001 );
item->m_fInReload = gun->m_fInReload;
item->m_fInSpecialReload = gun->m_fInSpecialReload;
item->fuser1 = max( gun->pev->fuser1, -0.001 );
Expand All @@ -1509,12 +1506,11 @@ int GetWeaponData( struct edict_s *player, struct weapon_data_s *info )
pPlayerItem = pPlayerItem->m_pNext;
}
}
}
}
#else
memset( info, 0, 32 * sizeof( weapon_data_t ) );
#endif
return 1;
*/
return TRUE;
}

/*
Expand Down

0 comments on commit 25dc354

Please sign in to comment.