diff --git a/Source/Client/Draw.c b/Source/Client/Draw.c index 8a57fe28..ce415514 100755 --- a/Source/Client/Draw.c +++ b/Source/Client/Draw.c @@ -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) ; diff --git a/Source/Menu/fteqcc.log b/Source/Menu/fteqcc.log new file mode 100755 index 00000000..b35441bc --- /dev/null +++ b/Source/Menu/fteqcc.log @@ -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 diff --git a/Source/Server/Client.c b/Source/Server/Client.c index b94fb470..d23c81d6 100755 --- a/Source/Server/Client.c +++ b/Source/Server/Client.c @@ -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 ); +} /* ================= diff --git a/Source/Shared/Weapons.c b/Source/Shared/Weapons.c index c11da815..e8ede14e 100755 --- a/Source/Shared/Weapons.c +++ b/Source/Shared/Weapons.c @@ -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(); } diff --git a/freecs/csprogs.dat b/freecs/csprogs.dat index d01f089c..1dfccfca 100644 Binary files a/freecs/csprogs.dat and b/freecs/csprogs.dat differ diff --git a/freecs/menu.dat b/freecs/menu.dat index d99dca8a..4821c62c 100755 Binary files a/freecs/menu.dat and b/freecs/menu.dat differ diff --git a/freecs/progs.dat b/freecs/progs.dat index 94051f74..2b0fbb14 100644 Binary files a/freecs/progs.dat and b/freecs/progs.dat differ