Updated... things

Source/Client/Player.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 float Player_PreDraw( void ) {
     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 ) ) ) {
 			vPlayerOrigin = self.origin;
 			vPlayerVelocity = '0 0 0';

Source/Server/Defs.h

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

Source/Shared/WeaponC4Bomb.c

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

Source/Shared/Weapons.c

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

freecs/default.cfg

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