コミット: f1eaf798e9457c1c18b156fff509cf5221e860c5 - zandronum-tspg (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG).

コミットメタ情報

• リビジョン: f1eaf798e9457c1c18b156fff509cf5221e860c5 (tree)
• 日時: 2013-07-18 03:31:46
• 作者: Teemu Piippo <crimsondusk64@gmai...>
• コミッター: Teemu Piippo

ログメッセージ

Fixed: The "ZCLD" client-side demo header was not written properly.

変更サマリ

• modified: src/cl_demo.cpp

差分

diff -r a3fa4aa68299 -r f1eaf798e945 src/cl_demo.cpp
--- a/src/cl_demo.cpp	Tue Jul 16 21:06:38 2013 +0200
+++ b/src/cl_demo.cpp	Wed Jul 17 20:31:46 2013 +0200
@@ -241,10 +241,6 @@
 	{  
 		lCommand = NETWORK_ReadByte( &g_ByteStream );
 
-		// End of message.
-		if ( lCommand == -1 )
-			break;
-
 		switch ( lCommand )
 		{
 		case CLD_DEMOVERSION:
@@ -280,6 +276,11 @@
 		case CLD_DEMOWADS:
 			CLIENTDEMO_ReadDemoWads( );
 			break;
+
+		// [Dusk] Bad headers shouldn't just be ignored, that's just asking for trouble.
+		default:
+			I_Error( "Unknown demo header %ld!\n", lCommand );
+			break;
 		}
 	}
 
@@ -530,7 +531,7 @@
 
 	// Go back real quick and write the length of this demo.
 	lDemoLength = g_ByteStream.pbStream - g_pbDemoBuffer;
-	ByteStream.pbStream = g_pbDemoBuffer + 6;
+	ByteStream.pbStream = g_pbDemoBuffer + 5;
 	ByteStream.pbStreamEnd = g_ByteStream.pbStreamEnd;
 	NETWORK_WriteLong( &ByteStream, lDemoLength );