From 1a5e2b907d5a9751fd3bc9867bd444d3d45fb86e Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Sat, 15 Jun 2024 13:56:15 +0300
Subject: [PATCH] engine: client: minor refactoring for cls.demoplayback check

---
 engine/client/cl_main.c     | 27 +++++++++++++++------------
 engine/client/cl_parse_48.c |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index 2d2c148a..613369f8 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -2378,21 +2378,24 @@ static void CL_ReadNetMessage( void )
 		// can't be a valid sequenced packet
 		if( cls.state < ca_connected ) continue;
 
-		if( !cls.demoplayback && MSG_GetMaxBytes( &net_message ) < 8 )
+		if( !cls.demoplayback )
 		{
-			Con_Printf( S_WARN "CL_ReadPackets: %s:runt packet\n", NET_AdrToString( net_from ));
-			continue;
-		}
+			if( MSG_GetMaxBytes( &net_message ) < 8 )
+			{
+				Con_Printf( S_WARN "CL_ReadPackets: %s:runt packet\n", NET_AdrToString( net_from ));
+				continue;
+			}
 
-		// packet from server
-		if( !cls.demoplayback && !NET_CompareAdr( net_from, cls.netchan.remote_address ))
-		{
-			Con_DPrintf( S_ERROR "CL_ReadPackets: %s:sequenced packet without connection\n", NET_AdrToString( net_from ));
-			continue;
-		}
+			// packet from server
+			if( !NET_CompareAdr( net_from, cls.netchan.remote_address ))
+			{
+				Con_DPrintf( S_ERROR "CL_ReadPackets: %s:sequenced packet without connection\n", NET_AdrToString( net_from ));
+				continue;
+			}
 
-		if( !cls.demoplayback && !Netchan_Process( &cls.netchan, &net_message ))
-			continue;	// wasn't accepted for some reason
+			if( !Netchan_Process( &cls.netchan, &net_message ))
+				continue;	// wasn't accepted for some reason
+		}
 
 		if( cls.state == ca_active )
 		{
diff --git a/engine/client/cl_parse_48.c b/engine/client/cl_parse_48.c
index 0dbd0a6a..8cb32411 100644
--- a/engine/client/cl_parse_48.c
+++ b/engine/client/cl_parse_48.c
@@ -264,7 +264,7 @@ static void CL_LegacyParseResourceList( sizebuf_t *msg )
 		Q_strncpy( reslist.resnames[i], MSG_ReadString( msg ), sizeof( reslist.resnames[i] ));
 	}
 
-	if( CL_IsPlaybackDemo() )
+	if( cls.demoplayback )
 		return;
 
 	if( !cl_allow_download.value )