diff --git a/Source/Server/Main.c b/Source/Server/Main.c index 42d82605..f6348006 100755 --- a/Source/Server/Main.c +++ b/Source/Server/Main.c @@ -30,8 +30,6 @@ void SV_SendChat( entity eSender, string sMessage, entity eEnt, float fType ) { WriteString( MSG_MULTICAST, sMessage ); msg_entity = eEnt; multicast( '0 0 0', MULTICAST_ONE ); - - localcmd( sprintf( "echo %s: %s\n", eSender.netname, sMessage ) ); } /* @@ -48,11 +46,13 @@ void SV_ParseClientCommand( string sCommand ) { // Players talk to players, spectators to spectators. if ( self.health ) { if ( argv( 0 ) == "say" ) { + localcmd( sprintf( "echo %s: %s\n", self.netname, argv( 1 ) ) ); for ( entity eFind = world; ( eFind = find( eFind, classname, "player" ) ); ) { SV_SendChat( self, argv( 1 ), eFind, 0 ); } return; } else if ( argv( 0 ) == "say_team" ) { + localcmd( sprintf( "echo %s: %s\n", self.netname, argv( 1 ) ) ); for ( entity eFind = world; ( eFind = find( eFind, classname, "player" ) ); ) { if ( eFind.team == self.team ) { SV_SendChat( self, argv( 1 ), eFind, 1 ); @@ -62,11 +62,13 @@ void SV_ParseClientCommand( string sCommand ) { } } else { if ( argv( 0 ) == "say" ) { + localcmd( sprintf( "echo [DEAD] %s: %s\n", self.netname, argv( 1 ) ) ); for ( entity eFind = world; ( eFind = find( eFind, classname, "spectator" ) ); ) { SV_SendChat( self, argv( 1 ), eFind, 1 ); } return; } else if ( argv( 0 ) == "say_team" ) { + localcmd( sprintf( "echo [DEAD] %s: %s\n", self.netname, argv( 1 ) ) ); return; } } diff --git a/Source/Server/Player.c b/Source/Server/Player.c index 12ba3f9e..21c4da66 100755 --- a/Source/Server/Player.c +++ b/Source/Server/Player.c @@ -322,6 +322,10 @@ void PlayerPostThink( void ) { float fFallDamage = self.fFallVelocity * ( 200 / ( 1024 - 580 ) ); Damage_Apply( self, world, fFallDamage, self.origin, FALSE ); } + + if ( self.fFallVelocity > 200 ) { + self.velocity = '0 0 0'; + } self.fFallVelocity = 0; } diff --git a/freecs/default.cfg b/freecs/default.cfg index eab63f7e..d3ea0a0c 100644 --- a/freecs/default.cfg +++ b/freecs/default.cfg @@ -34,7 +34,6 @@ bind m chooseteam bind ESC togglemenu // Movement Variables -seta com_protocolname "FREECS" seta sv_maxspeed 240 seta cl_forwardspeed 240 seta cl_sidespeed 240 @@ -50,7 +49,8 @@ seta cl_bobcycle 0.8 seta cl_bob 0.01 seta cl_bobup 0.5 seta r_particledesc default -seta pm_bunnyspeedcap 1 +seta pm_bunnyspeedcap "1" +seta sv_accelerate "4" seta con_color "255 170 0" seta vgui_color "255 170 0" diff --git a/freecs/ftesrv.cfg b/freecs/ftesrv.cfg index 5090efa4..28371b50 100755 --- a/freecs/ftesrv.cfg +++ b/freecs/ftesrv.cfg @@ -1,13 +1,25 @@ +// The publically advertised server name hostname "FreeCS Server" -seta com_protocolname "FREECS" -seta sv_maxspeed 240 +// Game variables +seta maxplayers 8 seta mp_startmoney "800" seta mp_buytime 90 seta mp_freezetime 6 seta mp_c4timer 45 seta mp_roundtime 5 seta mp_fillweapons 0 -seta pm_bunnyspeedcap 1 + +// Physics +seta pm_bunnyspeedcap "1" +seta sv_accelerate "4" +seta sv_maxspeed 240 + +// Misc seta com_nogamedirnativecode "0" -seta maxplayers 8 \ No newline at end of file + + +// for now, because people don't seem to be able to install things properly +seta allow_download_maps "0" +seta allow_download_models "0" +seta allow_download_sounds "0" \ No newline at end of file diff --git a/freecs/progs.dat b/freecs/progs.dat index 6260cdf7..31deecf4 100644 Binary files a/freecs/progs.dat and b/freecs/progs.dat differ