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

Updated... things

Browse source
This commit is contained in:
Marco Cawthorne 2017-04-20 00:04:47 +02:00
parent 24d92a7c1d
commit 8abd531b10
7 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Client/Player.c
View file

@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
float Player_PreDraw( void ) { float Player_PreDraw( void ) {
if ( self.entnum == player_localentnum ) { if ( self.entnum == player_localentnum ) {
// Don't predict if we're frozen/paused // Don't predict if we're frozen/paused FIXME: FTE doesn't have serverkey_float yet!
if ( serverkey( SERVERKEY_PAUSESTATE ) == "1" || ( ( getstati( STAT_GAMESTATE ) == GAME_FREEZE ) && ( getstati( STAT_HEALTH ) > 0 ) ) ) { if ( serverkey( SERVERKEY_PAUSESTATE ) == "1" || ( ( getstati( STAT_GAMESTATE ) == GAME_FREEZE ) && ( getstati( STAT_HEALTH ) > 0 ) ) ) {
vPlayerOrigin = self.origin; vPlayerOrigin = self.origin;
vPlayerVelocity = '0 0 0'; vPlayerVelocity = '0 0 0';

2
Source/Server/Defs.h
View file

@ -89,6 +89,8 @@ int iBombRadius; // For info_map_parameters
int iHostagesRescued; int iHostagesRescued;
int iBombPlanted; int iBombPlanted;
var float fGameFrametime;
// Generic entity fields // Generic entity fields
.int iUsable; .int iUsable;
.int iBleeds; .int iBleeds;

0
Source/Server/Timer.c Normal file → Executable file
View file

7
Source/Shared/WeaponC4Bomb.c Normal file → Executable file
View file

@ -142,9 +142,9 @@ void WeaponC4BOMB_Drop( vector vBombPos ) {
// If the user has the right equipment, make 10 seconds pass twice as fast // If the user has the right equipment, make 10 seconds pass twice as fast
if ( eActivator.iEquipment & EQUIPMENT_DEFUSALKIT ) { if ( eActivator.iEquipment & EQUIPMENT_DEFUSALKIT ) {
fDefuseProgress += ( frametime * 2 ); fDefuseProgress += ( fGameFrametime * 2 );
} else { } else {
fDefuseProgress += frametime; fDefuseProgress += fGameFrametime;
} }
eActivator.fProgressBar = (fDefuseProgress * 0.1); eActivator.fProgressBar = (fDefuseProgress * 0.1);
@ -215,8 +215,9 @@ void WeaponC4BOMB_PrimaryFire( void ) {
// Add onto the planting-time thing // Add onto the planting-time thing
self.fBombProgress += frametime; self.fBombProgress += frametime;
centerprint( self, ftos(self.fBombProgress ) );
// 3 seconds have passed, plant the bomb // 3 seconds have passed, plant the bomb
if ( self.fBombProgress >= 3.0 ) { if ( self.fBombProgress >= 3.0f ) {
WeaponC4BOMB_Drop( trace_endpos ); WeaponC4BOMB_Drop( trace_endpos );
} }
#else #else

6
Source/Shared/Weapons.c
View file

@ -125,8 +125,9 @@ void Weapon_PrimaryAttack( float fWeapon ) {
if ( !( self.flags & FL_SEMI_TOGGLED ) ) if ( !( self.flags & FL_SEMI_TOGGLED ) )
return; return;
#endif #endif
#ifdef CSQC
Animation_ShootWeapon(); Animation_ShootWeapon();
#endif
wpnFuncTable[ fWeapon ].vPrimary(); wpnFuncTable[ fWeapon ].vPrimary();
} }
@ -156,8 +157,9 @@ void Weapon_Reload( float fWeapon ) {
return; return;
} }
#endif #endif
#ifdef CSQC
Animation_ReloadWeapon(); Animation_ReloadWeapon();
#endif
wpnFuncTable[ fWeapon ].vReload(); wpnFuncTable[ fWeapon ].vReload();
} }

2
freecs/default.cfg Normal file → Executable file
View file

@ -56,7 +56,7 @@ seta con_color 255 128 0
seta vgui_color 255 128 0 seta vgui_color 255 128 0
seta cross_color 0 255 0 seta cross_color 0 255 0
hostname "Free Server" hostname "FreeCS Server"
seta vid_conautoscale "1" seta vid_conautoscale "1"
seta snd_device "sdl" seta snd_device "sdl"

BIN
freecs/progs.dat
View file

Binary file not shown.