vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

kill command kevlar fix. fixes #53

Browse source
This commit is contained in:
Marco Cawthorne 2017-11-11 15:46:04 -06:00
parent b409c6426a
commit 3c1f53ac3d
19 changed files with 51 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Client/Draw.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#define CHAT_LINES 5
#define CHAT_TIME 10
#define CHAT_TIME 20
var int iLineScroll = 0;
float fChatTime;

29
Source/FreeCS-CE.prj
View file

@ -1,5 +1,5 @@
<project version="Crimson Editor 3.60">
<category name="Client" expanded="no">
<category name="Client" expanded="yes">
<localfile path="C:\cygwin\home\User\FreeCS\Source\Client\Defs.h" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Client\Draw.c" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Client\Entities.c" />
@ -25,7 +25,7 @@
<localfile path="C:\cygwin\home\User\FreeCS\Source\Client\VGUITeamSelect.c" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Client\View.c" />
</category>
<category name="Server" expanded="no">
<category name="Server" expanded="yes">
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\AmbientSound.c" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\Ammo.c" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\ArmouryEntity.c" />
@ -60,7 +60,7 @@
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\TraceAttack.c" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\Triggers.c" />
</category>
<category name="Menu" expanded="yes">
<category name="Menu" expanded="no">
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\Defs.h" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\Draw.c" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\Header.c" />
@ -114,14 +114,29 @@
</project>
<workspace version="Crimson Editor 3.60">
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\Defs.h" linenum="143" placement="0:1:-1:-1:-4:-23:198:198:1084:634" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\Defs.h" linenum="129" placement="0:1:-1:-1:-4:-23:198:198:1084:634" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\MenuMain.c" linenum="49" placement="0:1:-1:-1:-4:-23:0:0:886:436" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\Objects.c" linenum="340" placement="0:1:-1:-1:-4:-23:22:22:908:458" />
<localfile path="C:\cygwin\home\User\FreeCS\freecs\menu.dat.en.po" linenum="48" placement="2:3:-1:-1:-4:-23:44:44:930:480" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\Objects.c" linenum="330" placement="0:1:-1:-1:-4:-23:22:22:908:458" />
<localfile path="C:\cygwin\home\User\FreeCS\freecs\menu.dat.en.po" linenum="48" placement="0:1:-1:-1:-4:-23:44:44:930:480" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\MenuMultiplayer.c" linenum="163" placement="0:1:-1:-1:-4:-23:88:88:974:524" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Builtins.h" linenum="2160" placement="0:1:-1:-1:-4:-23:110:110:996:546" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\MenuConfiguration.c" linenum="258" placement="0:1:-1:-1:-4:-23:132:132:1018:568" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\MenuConfiguration.c" linenum="298" placement="0:1:-1:-1:-4:-23:132:132:1018:568" />
<localfile path="C:\cygwin\home\User\FreeCS\freecs\default.cfg" linenum="65" placement="0:1:-1:-1:-4:-23:198:198:1084:634" />
<localfile path="C:\cygwin\home\User\FreeCS\freecs\ftesrv.cfg" linenum="9" placement="0:1:-1:-1:-4:-23:0:0:886:436" />
<localfile path="C:\cygwin\home\User\FreeCS\cstrike\gfx\shell\kb_act.lst" linenum="13" placement="0:1:-1:-1:-4:-23:44:44:930:480" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Shared\Weapons.c" linenum="420" placement="0:1:-1:-1:-4:-23:88:88:974:524" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\Client.c" linenum="64" placement="0:1:-1:-1:-4:-23:110:110:996:546" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\Player.c" linenum="143" placement="0:1:-1:-1:-4:-23:132:132:1018:568" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Client\HUDOrbituaries.c" linenum="18" placement="0:1:-1:-1:-4:-23:154:154:1040:590" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Client\HUDScope.c" linenum="28" placement="0:1:-1:-1:-4:-23:176:176:1062:612" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Shared\WeaponAUG.c" linenum="27" placement="0:1:-1:-1:-4:-23:198:198:1084:634" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Client\Draw.c" linenum="179" placement="0:1:-1:-1:-4:-23:0:0:886:436" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\Main.c" linenum="439" placement="0:1:-1:-1:-4:-23:22:22:908:458" />
<localfile path="C:\Users\User\Dropbox\The Wastes Build\sdk\Source\Client\View.c" linenum="129" placement="0:1:-1:-1:-4:-23:44:44:930:480" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\Rules.c" linenum="140" placement="0:1:-1:-1:-4:-23:110:110:996:546" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\TraceAttack.c" linenum="1" placement="0:1:-1:-1:-4:-23:132:132:1018:568" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\Timer.c" linenum="65" placement="0:1:-1:-1:-4:-23:154:154:1040:590" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\Spawn.c" linenum="291" placement="0:1:-1:-1:-4:-23:176:176:1062:612" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Shared\WeaponC4Bomb.c" linenum="82" placement="2:3:-1:-1:-4:-23:198:198:1084:634" />
</workspace>

2
Source/Server/Client.c
View file

@ -37,7 +37,7 @@ Suicide command 'kill' executes this function.
=================
*/
void ClientKill( void ) {
Damage_Apply( self, self, self.health, self.origin );
Damage_Apply( self, self, self.health, self.origin, TRUE );
}
/*

11
Source/Server/Damage.c
View file

@ -94,7 +94,7 @@ Damage_Apply
Generic function that applies damage, pain and suffering
=================
*/
void Damage_Apply( entity eTarget, entity eAttacker, int iDamage, vector vHitPos ) {
void Damage_Apply( entity eTarget, entity eAttacker, int iDamage, vector vHitPos, int iSkipArmor ) {
// Modify the damage based on the location
if ( trace_surface_id == BODY_HEAD ) {
if ( eTarget.iEquipment & EQUIPMENT_HELMET ) {
@ -137,7 +137,12 @@ void Damage_Apply( entity eTarget, entity eAttacker, int iDamage, vector vHitPos
}
eTarget.armor -= fNewArmor;
}
eTarget.health -= fNewDmg;
if ( iSkipArmor == TRUE ) {
eTarget.health -= iDamage;
} else {
eTarget.health -= fNewDmg;
}
} else {
// No armor
eTarget.health -= iDamage;
@ -203,7 +208,7 @@ void Damage_Radius( vector vOrigin, entity eAttacker, float fDamage, float fRadi
fDamage = fDamage * fDiff;
if ( fDamage > 0 ) {
Damage_Apply( eDChain, eAttacker, fDamage, eDChain.origin );
Damage_Apply( eDChain, eAttacker, fDamage, eDChain.origin, FALSE );
}
}
eDChain = eDChain.chain;

2
Source/Server/Defs.h
View file

@ -148,7 +148,7 @@ void Effect_CreateFlash( entity eTarget );
void TraceAttack_FireBullets( int iShots, vector vPos );
void Damage_Radius( vector vOrigin, entity eAttacker, float fDamage, float fRadius );
void Damage_Apply( entity eTarget, entity eAttacker, int iDamage, vector vHitPos );
void Damage_Apply( entity eTarget, entity eAttacker, int iDamage, vector vHitPos, int iSkipArmor );
void Entities_UseTargets( void );
void Entities_InitRespawnable( void() vRespawnFunc );

4
Source/Server/FuncBreakable.c
View file

@ -108,10 +108,10 @@ void func_breakable_touch( void ) {
if ( fDamage >= self.health ) {
self.touch = func_breakable_touch_NULL;
Damage_Apply( self, other, fDamage, self.absmin );
Damage_Apply( self, other, fDamage, self.absmin, FALSE );
if ( ( self.material == MATERIAL_GLASS ) || ( self.material == MATERIAL_COMPUTER ) ) {
Damage_Apply( other, self, fDamage / 4, other.origin );
Damage_Apply( other, self, fDamage / 4, other.origin, FALSE );
}
}
}

2
Source/Server/FuncButton.c
View file

@ -254,7 +254,7 @@ FuncButton_Blocked
*/
void FuncButton_Blocked( void ) {
if ( self.dmg ) {
Damage_Apply( other, self, self.dmg, other.origin );
Damage_Apply( other, self, self.dmg, other.origin, FALSE );
}
if ( self.wait >= 0 ) {

2
Source/Server/FuncDoor.c
View file

@ -220,7 +220,7 @@ FuncDoor_Blocked
*/
void FuncDoor_Blocked( void ) {
if( self.dmg ) {
Damage_Apply( other, self, self.dmg, other.origin );
Damage_Apply( other, self, self.dmg, other.origin, FALSE );
}
if ( self.wait >= 0 ) {

2
Source/Server/FuncDoorRotating.c
View file

@ -192,7 +192,7 @@ FuncDoorRotate_Blocked
*/
void FuncDoorRotate_Blocked( void ) {
if ( self.dmg ) {
Damage_Apply( other, self, self.dmg, other.origin );
Damage_Apply( other, self, self.dmg, other.origin, FALSE );
}
if ( self.wait >= 0 ) {

2
Source/Server/Player.c
View file

@ -320,7 +320,7 @@ void PlayerPostThink( void ) {
if ( self.fFallVelocity > 580 ) {
self.fFallVelocity -= 580;
float fFallDamage = self.fFallVelocity * ( 200 / ( 1024 - 580 ) );
Damage_Apply( self, world, fFallDamage, self.origin );
Damage_Apply( self, world, fFallDamage, self.origin, FALSE );
}
self.fFallVelocity = 0;
}

2
Source/Server/TraceAttack.c
View file

@ -40,7 +40,7 @@ void TraceAttack_FireSingle( vector vPos, vector vAngle ) {
if (trace_fraction != 1.0) {
if ( trace_ent.takedamage == DAMAGE_YES ) {
Damage_Apply( trace_ent, self, wptTable[ self.weapon ].iDamage, trace_endpos );
Damage_Apply( trace_ent, self, wptTable[ self.weapon ].iDamage, trace_endpos, FALSE );
}
if ( trace_ent.iBleeds == TRUE ) {

2
Source/Server/Triggers.c
View file

@ -156,7 +156,7 @@ void trigger_hurt( void ) {
Entities_UseTargets();
}
Damage_Apply( other, self, self.dmg, other.origin );
Damage_Apply( other, self, self.dmg, other.origin, FALSE );
// Shut it down if used once
if ( self.spawnflags & SF_HURT_ONCE ) {

2
Source/Shared/BaseMelee.c
View file

@ -45,7 +45,7 @@ int BaseMelee_Attack( void ) {
Effect_Impact( IMPACT_FLESH, trace_endpos, trace_plane_normal );
sound( self, CHAN_WEAPON, sprintf( "weapons/knife_hit%d.wav", floor( ( random() * 4 ) + 1 ) ), 1, ATTN_NORM );
}
Damage_Apply( trace_ent, self, wptTable[ self.weapon ].iDamage, trace_endpos );
Damage_Apply( trace_ent, self, wptTable[ self.weapon ].iDamage, trace_endpos, FALSE );
} else {
Effect_Impact( IMPACT_MELEE, trace_endpos, trace_plane_normal );
}

9
Source/Shared/WeaponC4Bomb.c
View file

@ -94,6 +94,7 @@ static void WeaponC4BOMB_Use( void ) {
}
eActivator.fProgressBar = (fDefuseProgress * 0.1);
self.fProgressBar = time + 1.0f;
// Make sure WeaponC4BOMB_Think knows who the user is
self.eUser = eActivator;
@ -102,9 +103,11 @@ static void WeaponC4BOMB_Use( void ) {
static void WeaponC4BOMB_Think( void ) {
// If the guy who started using us stopped using us, reset the defuser counter
if ( ( self.eUser != world ) && ( self.eUser.button6 == FALSE ) ) {
self.eUser.fProgressBar = 0;
self.eUser = world;
fDefuseProgress = 0;
if ( self.fProgressBar < time ) {
self.eUser.fProgressBar = 0;
self.eUser = world;
fDefuseProgress = 0;
}
}
// If our time has passed, explode

2
Source/Shared/WeaponFlashbang.c
View file

@ -126,7 +126,7 @@ void WeaponFLASHBANG_Throw( void ) {
return;
}
if ( other.classname == "func_breakable" ) {
Damage_Apply( other, self, 10, self.origin );
Damage_Apply( other, self, 10, self.origin, FALSE );
}
sound( self, CHAN_WEAPON, sprintf( "weapons/grenade_hit%d.wav", floor( random() * 3 ) + 1 ), 1, ATTN_NORM );
}

2
Source/Shared/WeaponHEGrenade.c
View file

@ -108,7 +108,7 @@ void WeaponHEGRENADE_Throw( void ) {
return;
}
if ( other.classname == "func_breakable" && other.material == MATERIAL_GLASS ) {
Damage_Apply( other, self, 10, self.origin );
Damage_Apply( other, self, 10, self.origin, FALSE );
}
sound( self, CHAN_WEAPON, "weapons/he_bounce-1.wav", 1, ATTN_NORM );

2
Source/Shared/WeaponSmokeGrenade.c
View file

@ -114,7 +114,7 @@ void WeaponSMOKEGRENADE_Throw( void ) {
return;
}
if ( other.classname == "func_breakable" ) {
Damage_Apply( other, self, 10, self.origin );
Damage_Apply( other, self, 10, self.origin, FALSE );
}
sound( self, CHAN_WEAPON, sprintf( "weapons/grenade_hit%d.wav", floor( random() * 3 ) + 1 ), 1, ATTN_NORM );
}

BIN
freecs/csprogs.dat
View file

Binary file not shown.

BIN
freecs/progs.dat
View file

Binary file not shown.