[chocolate-doom] 18/26: Exit with an error when playing a demo with the wrong version, like Vanilla Doom

[Jonathan Dowland]

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

jmtd pushed a commit to annotated tag chocolate-doom-0.1.4
in repository chocolate-doom.

commit 3c49da2986b6c1e72d977a6866279ff7922c59dc
Author: Simon Howard <fraggle at gmail.com>
Date:   Fri Jan 27 18:23:00 2006 +0000

    Exit with an error when playing a demo with the wrong version, like Vanilla Doom
    
    Subversion-branch: /branches/CHOCOLATE_DOOM_0_1/chocolate-doom
    Subversion-revision: 350
---
 src/g_game.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index 019ff92..7442899 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: g_game.c 333 2006-01-23 00:12:36Z fraggle $
+// $Id: g_game.c 350 2006-01-27 18:23:00Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.20.2.3  2006/01/27 18:23:00  fraggle
+// Exit with an error when playing a demo with the wrong version, like Vanilla Doom
+//
 // Revision 1.20.2.2  2006/01/23 00:12:36  fraggle
 // Fix dehacked sky replacement
 //
@@ -111,7 +114,7 @@
 
 
 static const char
-rcsid[] = "$Id: g_game.c 333 2006-01-23 00:12:36Z fraggle $";
+rcsid[] = "$Id: g_game.c 350 2006-01-27 18:23:00Z fraggle $";
 
 #include <string.h>
 #include <stdlib.h>
@@ -1725,10 +1728,12 @@ void G_DoPlayDemo (void)
     }
     else
     {
-      fprintf( stderr, "Demo is from a different game version!\n");
-      fprintf(stderr, "%i, %i\n", demoversion, DOOM_VERSION);
-      gameaction = ga_nothing;
-      return;
+        char errorbuf[80];
+
+        sprintf(errorbuf, "Demo is from a different game version! (read %i, should be %i)\n",
+                demoversion, DOOM_VERSION);
+
+        I_Error(errorbuf);
     }
     
     skill = *demo_p++; 

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