[iortcw] 140/497: All: Revert commit r405...Pretty much unusable

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 1629e083517658f921cd61739e4110a195df0eb0
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Wed Jun 11 12:55:23 2014 +0000

    All: Revert commit r405...Pretty much unusable
---
 MP/code/client/cl_main.c | 8 +++++++-
 SP/code/client/cl_main.c | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
index 4f5231a..a414cb0 100644
--- a/MP/code/client/cl_main.c
+++ b/MP/code/client/cl_main.c
@@ -1565,7 +1565,7 @@ void CL_Disconnect( qboolean showMainMenu ) {
 #endif
 
 	// Stop recording any video
-	if( clc.demoplaying && CL_VideoRecording( ) ) {
+	if( CL_VideoRecording( ) ) {
 		// Finish rendering current frame
 		SCR_UpdateScreen( );
 		CL_CloseAVI( );
@@ -3879,6 +3879,12 @@ void CL_Video_f( void )
 	char  filename[ MAX_OSPATH ];
 	int   i, last;
 
+	if( !clc.demoplaying )
+	{
+		Com_Printf( "The video command can only be used when playing back demos\n" );
+		return;
+	}
+
 	if( Cmd_Argc( ) == 2 )
 	{
 		// explicit filename
diff --git a/SP/code/client/cl_main.c b/SP/code/client/cl_main.c
index fe694ff..48cfc51 100644
--- a/SP/code/client/cl_main.c
+++ b/SP/code/client/cl_main.c
@@ -1494,7 +1494,7 @@ void CL_Disconnect( qboolean showMainMenu ) {
 #endif
 
 	// Stop recording any video
-	if( clc.demoplaying && CL_VideoRecording( ) ) {
+	if( CL_VideoRecording( ) ) {
 		// Finish rendering current frame
 		SCR_UpdateScreen( );
 		CL_CloseAVI( );
@@ -3551,6 +3551,12 @@ void CL_Video_f( void )
 	char  filename[ MAX_OSPATH ];
 	int   i, last;
 
+	if( !clc.demoplaying )
+	{
+		Com_Printf( "The video command can only be used when playing back demos\n" );
+		return;
+	}
+
 	if( Cmd_Argc( ) == 2 )
 	{
 		// explicit filename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git