upload "kind" alien swarm

game/shared/usercmd.cpp

@@ -1,4 +1,4 @@
-//========= Copyright Valve Corporation, All rights reserved. ============//
+//========= Copyright <20> 1996-2005, Valve Corporation, All rights reserved. ============//
 //
 // Purpose: 
 //
@@ -16,6 +16,105 @@
 // TF2 specific, need enough space for OBJ_LAST items from tf_shareddefs.h
 #define WEAPON_SUBTYPE_BITS	6
 
+//-----------------------------------------------------------------------------
+#ifdef CLIENT_DLL
+ConVar net_showusercmd( "net_showusercmd", "0", 0, "Show user command encoding" );
+#define LogUserCmd( msg, ... ) if ( net_showusercmd.GetInt() ) { ConDMsg( msg, __VA_ARGS__ ); }
+#else
+#define LogUserCmd( msg, ... ) NULL;
+#endif
+
+//-----------------------------------------------------------------------------
+static bool WriteUserCmdDeltaInt( bf_write *buf, char *what, int from, int to, int bits = 32 )
+{
+	if ( from != to )
+	{
+		LogUserCmd( "\t%s %d -> %d\n", what, from, to );
+
+		buf->WriteOneBit( 1 );
+		buf->WriteUBitLong( to, bits );
+		return true;
+	}
+
+	buf->WriteOneBit( 0 );
+	return false;
+}
+
+static bool WriteUserCmdDeltaShort( bf_write *buf, char *what, int from, int to )
+{
+	if ( from != to )
+	{
+		LogUserCmd( "\t%s %d -> %d\n", what, from, to );
+
+		buf->WriteOneBit( 1 );
+		buf->WriteShort( to );
+		return true;
+	}
+
+	buf->WriteOneBit( 0 );
+	return false;
+}
+
+static bool WriteUserCmdDeltaFloat( bf_write *buf, char *what, float from, float to )
+{
+	if ( from != to )
+	{
+		LogUserCmd( "\t%s %2.2f -> %2.2f\n", what, from, to );
+
+		buf->WriteOneBit( 1 );
+		buf->WriteFloat( to );
+		return true;
+	}
+
+	buf->WriteOneBit( 0 );
+	return false;
+}
+
+static bool WriteUserCmdDeltaCoord( bf_write *buf, char *what, float from, float to )
+{
+	if ( from != to )
+	{
+		LogUserCmd( "\t%s %2.2f -> %2.2f\n", what, from, to );
+
+		buf->WriteOneBit( 1 );
+		buf->WriteBitCoord( to );
+		return true;
+	}
+
+	buf->WriteOneBit( 0 );
+	return false;
+}
+
+static bool WriteUserCmdDeltaAngle( bf_write *buf, char *what, float from, float to, int bits )
+{
+	if ( from != to )
+	{
+		LogUserCmd( "\t%s %2.2f -> %2.2f\n", what, from, to );
+
+		buf->WriteOneBit( 1 );
+		buf->WriteBitAngle( to, bits );
+		return true;
+	}
+
+	buf->WriteOneBit( 0 );
+	return false;
+}
+
+static bool WriteUserCmdDeltaVec3Coord( bf_write *buf, char *what, const Vector &from, const Vector &to )
+{
+	if ( from != to )
+	{
+		LogUserCmd( "\t%s %2.2f -> %2.2f\n", what, from, to );
+
+		buf->WriteOneBit( 1 );
+		buf->WriteBitVec3Coord( to );
+		return true;
+	}
+
+	buf->WriteOneBit( 0 );
+	return false;
+}
+
 //-----------------------------------------------------------------------------
 // Purpose: Write a delta compressed user command.
 // Input  : *buf - 
@@ -25,160 +124,128 @@
 //-----------------------------------------------------------------------------
 void WriteUsercmd( bf_write *buf, const CUserCmd *to, const CUserCmd *from )
 {
-	if ( to->command_number != ( from->command_number + 1 ) )
+	LogUserCmd("WriteUsercmd: from=%d to=%d\n", from->command_number, to->command_number );
+
+	WriteUserCmdDeltaInt( buf, "command_number", from->command_number + 1, to->command_number, 32 );
+	WriteUserCmdDeltaInt( buf, "tick_count", from->tick_count + 1, to->tick_count, 32 );
+
+	WriteUserCmdDeltaFloat( buf, "viewangles[0]", from->viewangles[0], to->viewangles[0] );
+	WriteUserCmdDeltaFloat( buf, "viewangles[1]", from->viewangles[1], to->viewangles[1] );
+	WriteUserCmdDeltaFloat( buf, "viewangles[2]", from->viewangles[2], to->viewangles[2] );
+
+	WriteUserCmdDeltaFloat( buf, "forwardmove", from->forwardmove, to->forwardmove );
+	WriteUserCmdDeltaFloat( buf, "sidemove", from->sidemove, to->sidemove );
+	WriteUserCmdDeltaFloat( buf, "upmove", from->upmove, to->upmove );
+	WriteUserCmdDeltaInt( buf, "buttons", from->buttons, to->buttons, 32 );
+	WriteUserCmdDeltaInt( buf, "impulse", from->impulse, to->impulse, 8 );
+
+#if defined( INFESTED_DLL )
+	if ( to->crosshairtrace != from->crosshairtrace )
 	{
 		buf->WriteOneBit( 1 );
-		buf->WriteUBitLong( to->command_number, 32 );
+		buf->WriteBitVec3Coord( to->crosshairtrace );
 	}
 	else
 	{
 		buf->WriteOneBit( 0 );
 	}
 
-	if ( to->tick_count != ( from->tick_count + 1 ) )
-	{
-		buf->WriteOneBit( 1 );
-		buf->WriteUBitLong( to->tick_count, 32 );
-	}
-	else
-	{
-		buf->WriteOneBit( 0 );
-	}
-
-
-	if ( to->viewangles[ 0 ] != from->viewangles[ 0 ] )
-	{
-		buf->WriteOneBit( 1 );
-		buf->WriteFloat( to->viewangles[ 0 ] );
-	}
-	else
-	{
-		buf->WriteOneBit( 0 );
-	}
-
-	if ( to->viewangles[ 1 ] != from->viewangles[ 1 ] )
-	{
-		buf->WriteOneBit( 1 );
-		buf->WriteFloat( to->viewangles[ 1 ] );
-	}
-	else
-	{
-		buf->WriteOneBit( 0 );
-	}
-
-	if ( to->viewangles[ 2 ] != from->viewangles[ 2 ] )
-	{
-		buf->WriteOneBit( 1 );
-		buf->WriteFloat( to->viewangles[ 2 ] );
-	}
-	else
-	{
-		buf->WriteOneBit( 0 );
-	}
-
-	if ( to->forwardmove != from->forwardmove )
-	{
-		buf->WriteOneBit( 1 );
-		buf->WriteFloat( to->forwardmove );
-	}
-	else
-	{
-		buf->WriteOneBit( 0 );
-	}
-
-	if ( to->sidemove != from->sidemove )
-	{
-		buf->WriteOneBit( 1 );
-		buf->WriteFloat( to->sidemove );
-	}
-	else
-	{
-		buf->WriteOneBit( 0 );
-	}
-
-	if ( to->upmove != from->upmove )
-	{
-		buf->WriteOneBit( 1 );
-		buf->WriteFloat( to->upmove );
-	}
-	else
-	{
-		buf->WriteOneBit( 0 );
-	}
-
-	if ( to->buttons != from->buttons )
-	{
-		buf->WriteOneBit( 1 );
-	  	buf->WriteUBitLong( to->buttons, 32 );
- 	}
-	else
-	{
-		buf->WriteOneBit( 0 );
-	}
-
-	if ( to->impulse != from->impulse )
-	{
-		buf->WriteOneBit( 1 );
-	    buf->WriteUBitLong( to->impulse, 8 );
-	}
-	else
-	{
-		buf->WriteOneBit( 0 );
-	}
-
-
 	if ( to->weaponselect != from->weaponselect )
 	{
 		buf->WriteOneBit( 1 );
-		buf->WriteUBitLong( to->weaponselect, MAX_EDICT_BITS );
-
-		if ( to->weaponsubtype != from->weaponsubtype )
-		{
-			buf->WriteOneBit( 1 );
-			buf->WriteUBitLong( to->weaponsubtype, WEAPON_SUBTYPE_BITS );
-		}
-		else
-		{
-			buf->WriteOneBit( 0 );
-		}
+		buf->WriteUBitLong( to->weaponselect, MAX_EDICT_BITS );		
 	}
 	else
 	{
 		buf->WriteOneBit( 0 );
 	}
 
+	if ( to->weaponsubtype != from->weaponsubtype )
+	{
+		buf->WriteOneBit( 1 );
+		buf->WriteUBitLong( to->weaponsubtype, WEAPON_SUBTYPE_BITS );
+	}
+	else
+	{
+		buf->WriteOneBit( 0 );
+	}
+#endif
 
+
+#ifdef INFESTED_DLL // asw - check weapon subtype seperately, since we use it to say which marine we're controlling
+
+	if ( to->crosshair_entity != from->crosshair_entity )
+	{
+		buf->WriteOneBit( 1 );
+		buf->WriteShort( to->crosshair_entity );
+	}
+	else
+	{
+		buf->WriteOneBit( 0 );
+	}
+
+	if ( to->forced_action != from->forced_action )
+	{
+		buf->WriteOneBit( 1 );
+		buf->WriteShort( to->forced_action );
+	}
+	else
+	{
+		buf->WriteOneBit( 0 );
+	}
+
+	if ( to->sync_kill_ent != from->sync_kill_ent )
+	{
+		buf->WriteOneBit( 1 );
+		buf->WriteShort( to->sync_kill_ent );
+	}
+	else
+	{
+		buf->WriteOneBit( 0 );
+	}
+
+	WriteUserCmdDeltaVec3Coord( buf, "skill_dest", from->skill_dest, to->skill_dest );
+
+	if ( to->skill_dest_ent != from->skill_dest_ent )
+	{
+		buf->WriteOneBit( 1 );
+		buf->WriteShort( to->skill_dest_ent );
+	}
+	else
+	{
+		buf->WriteOneBit( 0 );
+	}
+
+#else
+	if ( WriteUserCmdDeltaInt( buf, "weaponselect", from->weaponselect, to->weaponselect, MAX_EDICT_BITS ) )
+	{
+		WriteUserCmdDeltaInt( buf, "weaponsubtype", from->weaponsubtype, to->weaponsubtype, WEAPON_SUBTYPE_BITS );
+	}
+#endif
+
+#ifndef INFESTED_DLL		// alien swarm doesn't need these
 	// TODO: Can probably get away with fewer bits.
-	if ( to->mousedx != from->mousedx )
-	{
-		buf->WriteOneBit( 1 );
-		buf->WriteShort( to->mousedx );
-	}
-	else
-	{
-		buf->WriteOneBit( 0 );
-	}
-
-	if ( to->mousedy != from->mousedy )
-	{
-		buf->WriteOneBit( 1 );
-		buf->WriteShort( to->mousedy );
-	}
-	else
-	{
-		buf->WriteOneBit( 0 );
-	}
+	WriteUserCmdDeltaShort( buf, "mousedx", from->mousedx, to->mousedx );
+	WriteUserCmdDeltaShort( buf, "mousedy", from->mousedy, to->mousedy );
+#endif
 
 #if defined( HL2_CLIENT_DLL )
 	if ( to->entitygroundcontact.Count() != 0 )
 	{
+		LogUserCmd( "\t%s %d\n", "entitygroundcontact", to->entitygroundcontact.Count() );
+
 		buf->WriteOneBit( 1 );
 		buf->WriteShort( to->entitygroundcontact.Count() );
 		int i;
 		for (i = 0; i < to->entitygroundcontact.Count(); i++)
 		{
+			LogUserCmd( "\t\t%s %d\n", "entitygroundcontact[%d].entindex", i, to->entitygroundcontact[i].entindex );
 			buf->WriteUBitLong( to->entitygroundcontact[i].entindex, MAX_EDICT_BITS );
+
+			LogUserCmd( "\t\t%s %2.2f\n", "entitygroundcontact[%d].minheight", i, to->entitygroundcontact[i].minheight );
 			buf->WriteBitCoord( to->entitygroundcontact[i].minheight );
+
+			LogUserCmd( "\t\t%s %2.2f\n", "entitygroundcontact[%d].maxheight", i, to->entitygroundcontact[i].maxheight );
 			buf->WriteBitCoord( to->entitygroundcontact[i].maxheight );
 		}
 	}
@@ -187,6 +254,21 @@ void WriteUsercmd( bf_write *buf, const CUserCmd *to, const CUserCmd *from )
 		buf->WriteOneBit( 0 );
 	}
 #endif
+
+
+
+	if ( IsHeadTrackingEnabled() )
+	{
+		// TrackIR head angles
+		WriteUserCmdDeltaAngle( buf, "headangles[0]", from->headangles[ 0 ], to->headangles[ 0 ], 16 );
+		WriteUserCmdDeltaAngle( buf, "headangles[1]", from->headangles[ 1 ], to->headangles[ 1 ], 16 );
+		WriteUserCmdDeltaAngle( buf, "headangles[2]", from->headangles[ 2 ], to->headangles[ 2 ], 8 );
+
+		// TrackIR head offset
+		WriteUserCmdDeltaVec3Coord( buf, "headoffset", from->headoffset, to->headoffset );
+
+		// TrackIR
+	}
 }
 
 //-----------------------------------------------------------------------------
@@ -237,8 +319,6 @@ void ReadUsercmd( bf_read *buf, CUserCmd *move, CUserCmd *from )
 		move->viewangles[2] = buf->ReadFloat();
 	}
 
-	// Moved value validation and clamping to CBasePlayer::ProcessUsercmds()
-
 	// Read movement
 	if ( buf->ReadOneBit() )
 	{
@@ -266,7 +346,46 @@ void ReadUsercmd( bf_read *buf, CUserCmd *move, CUserCmd *from )
 		move->impulse = buf->ReadUBitLong( 8 );
 	}
 
+#if defined( INFESTED_DLL )
+	if ( buf->ReadOneBit() )
+	{
+		buf->ReadBitVec3Coord( move->crosshairtrace );
+	}
+	if ( buf->ReadOneBit() )
+	{
+		move->weaponselect = buf->ReadUBitLong( MAX_EDICT_BITS );		
+	}
 
+	if ( buf->ReadOneBit() )
+	{
+		move->weaponsubtype = buf->ReadUBitLong( WEAPON_SUBTYPE_BITS );
+	}
+#endif
+
+#ifdef INFESTED_DLL // asw - check weapon subtype seperately, since we use it to say which marine we're controlling
+
+
+	if ( buf->ReadOneBit() )
+	{
+		move->crosshair_entity = buf->ReadShort();
+	}
+	if ( buf->ReadOneBit() )
+	{
+		move->forced_action = buf->ReadShort();
+	}
+	if ( buf->ReadOneBit() )
+	{
+		move->sync_kill_ent = buf->ReadShort();
+	}
+	if ( buf->ReadOneBit() )
+	{
+		buf->ReadBitVec3Coord(move->skill_dest);
+	}
+	if ( buf->ReadOneBit() )
+	{
+		move->skill_dest_ent = buf->ReadShort();
+	}
+#else
 	if ( buf->ReadOneBit() )
 	{
 		move->weaponselect = buf->ReadUBitLong( MAX_EDICT_BITS );
@@ -275,10 +394,11 @@ void ReadUsercmd( bf_read *buf, CUserCmd *move, CUserCmd *from )
 			move->weaponsubtype = buf->ReadUBitLong( WEAPON_SUBTYPE_BITS );
 		}
 	}
-
+#endif
 
 	move->random_seed = MD5_PseudoRandom( move->command_number ) & 0x7fffffff;
 
+#ifndef INFESTED_DLL		// alien swarm doesn't need these
 	if ( buf->ReadOneBit() )
 	{
 		move->mousedx = buf->ReadShort();
@@ -288,6 +408,7 @@ void ReadUsercmd( bf_read *buf, CUserCmd *move, CUserCmd *from )
 	{
 		move->mousedy = buf->ReadShort();
 	}
+#endif
 
 #if defined( HL2_DLL )
 	if ( buf->ReadOneBit() )
@@ -303,4 +424,33 @@ void ReadUsercmd( bf_read *buf, CUserCmd *move, CUserCmd *from )
 		}
 	}
 #endif
+
+
+
+	if ( IsHeadTrackingEnabled() )
+	{
+		// TrackIR head angles
+		if ( buf->ReadOneBit() )
+		{
+			move->headangles[0] = buf->ReadBitAngle( 16 );
+		}
+
+		if ( buf->ReadOneBit() )
+		{
+			move->headangles[1] = buf->ReadBitAngle( 16 );
+		}
+
+		if ( buf->ReadOneBit() )
+		{
+			move->headangles[2] = buf->ReadBitAngle( 8 );
+		}
+
+		// TrackIR head offset
+		if ( buf->ReadOneBit() )
+		{
+			buf->ReadBitVec3Coord(move->headoffset);
+		}
+		// TrackIR
+	}
+
 }