Commits

Teemu Piippo committed 0e5e668

Fixed: A_M_CheckAttack did not properly update attack cancellations to clients.

  • Participants
  • Parent commits 6cbee6f

Comments (0)

Files changed (2)

docs/zandronum-history.txt

 -	- Fixed: Using reconnect while playing a demo caused the game to crash. [Torr Samaho]
 -	- Fixed: The lag icon was missing from zandronum.pk3. [Torr Samaho]
 -	- Fixed: If a player respawned with a console or lag icon above his head, the icon vanished. [Torr Samaho]
+-	- Fixed: A_M_CheckAttack did not properly update attack cancellations to clients. [Dusk]
 !	- sv_coop_damagefactor is not archived in the config file anymore, but reset to its default value when the game starts. [Torr Samaho]
 
 

src/g_doom/a_scriptedmarine.cpp

 DEFINE_ACTION_FUNCTION(AActor, A_M_CheckAttack)
 {
 	// [BC] Don't do this in client mode.
-	if (( NETWORK_GetState( ) == NETSTATE_CLIENT ) ||
-		( CLIENTDEMO_IsPlaying( )))
+	if ( NETWORK_InClientMode( ) )
 	{
 		return;
 	}
 
 	if (self->special1 != 0 || self->target == NULL)
 	{
+		// [Dusk] Update the state to clients
+		if ( NETWORK_GetState( ) == NETSTATE_SERVER )
+			SERVERCOMMANDS_SetThingFrame( self, self->FindState("SkipAttack") );
 		self->SetState (self->FindState("SkipAttack"));
 	}
 	else