Fixed the weapon-magazine-drop problem.

Fixed the sniper rifle zooms.
Fixed the kill command.
This commit is contained in:
Marco Cawthorne 2017-11-11 01:25:59 -06:00
parent f6837a41b5
commit 24c0898f47
7 changed files with 45 additions and 2 deletions

View file

@ -161,6 +161,9 @@ void CSQC_UpdateView( float fWinWidth, float fWinHeight, float fGameFocus ) {
Nightvision_PreDraw();
setproperty( VF_AFOV, cvar( "fov" ) * ( getstatf( STAT_VIEWZOOM ) / 255 ) );
setsensitivityscaler( ( getstatf( STAT_VIEWZOOM ) / 255 ) );
// When Cameratime is active, draw on the forced coords instead
if ( fCameraTime > time ) {
setproperty( VF_ORIGIN, vCameraPos) ;

34
Source/Menu/fteqcc.log Executable file
View file

@ -0,0 +1,34 @@
Args: "C:\Users\User\Dropbox\The Wastes Build\bin\fteqcc.exe"
FTEQCC: Jun 5 2017
Source file: progs.src
Outputfile: ../../freecs/menu.dat
including ../Builtins.h
including ../Math.h
including Defs.h
including Init.c
including Input.c
including Objects.c
including MenuMain.c
including MenuConfiguration.c
including MenuMultiplayer.c
including Header.c
including Draw.c
Compile finished: ../../freecs/menu.dat (fte format)
Done. 0 warnings
Args: "C:\Users\User\Dropbox\The Wastes Build\bin\fteqcc.exe"
FTEQCC: Jun 5 2017
Source file: progs.src
Outputfile: ../../freecs/menu.dat
including ../Builtins.h
including ../Math.h
including Defs.h
including Init.c
including Input.c
including Objects.c
including MenuMain.c
including MenuConfiguration.c
including MenuMultiplayer.c
including Header.c
including Draw.c
Compile finished: ../../freecs/menu.dat (fte format)
Done. 0 warnings

View file

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

View file

@ -405,6 +405,8 @@ void Weapon_DropWeapon( int iSlot ) {
if ( Weapon_SlotEmpty( Weapon_GetSlot( eOld.weapon ) ) ) {
Weapon_AddItem( eOld.weapon );
Weapon_Draw( eOld.weapon );
self.(wptTable[ eOld.weapon ].iMagfld) = eOld.health;
Weapon_UpdateCurrents();
} else {
self = eOld;
return;
@ -433,7 +435,7 @@ void Weapon_DropWeapon( int iSlot ) {
return;
}
self.weapon = 0;
entity eDrop = spawn();
setorigin( eDrop, self.origin + self.view_ofs );
@ -446,11 +448,13 @@ void Weapon_DropWeapon( int iSlot ) {
eDrop.think = Weapon_DropWeapon_Think;
eDrop.touch = Weapon_DropWeapon_Touch;
eDrop.nextthink = time + 1.0f;
eDrop.health = self.(wptTable[ fWeapon ].iMagfld);
setsize( eDrop, '-16 -16 0', '16 16 16' );
makevectors( self.v_angle );
eDrop.velocity = aim( self, 10000 ) * 256;
self.weapon = 0;
Weapon_SwitchBest();
}

Binary file not shown.

Binary file not shown.

Binary file not shown.