summaryrefslogtreecommitdiff
path: root/src/g_game.c
diff options
context:
space:
mode:
authorSimon Howard2006-01-27 18:23:08 +0000
committerSimon Howard2006-01-27 18:23:08 +0000
commit305ed7daf479c4c6fddec3bab334c38c46306012 (patch)
tree1037f1787c1e296d35b4edd73125cca2d4f68637 /src/g_game.c
parent769dd503014eea1de74c1ccf26840c64d1abc4df (diff)
downloadchocolate-doom-305ed7daf479c4c6fddec3bab334c38c46306012.tar.gz
chocolate-doom-305ed7daf479c4c6fddec3bab334c38c46306012.tar.bz2
chocolate-doom-305ed7daf479c4c6fddec3bab334c38c46306012.zip
Exit with an error when playing a demo with the wrong version, like Vanilla Doom
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 351
Diffstat (limited to 'src/g_game.c')
-rw-r--r--src/g_game.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/g_game.c b/src/g_game.c
index 40ff7378..f7265a72 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: g_game.c 332 2006-01-23 00:12:25Z fraggle $
+// $Id: g_game.c 351 2006-01-27 18:23:08Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.23 2006/01/27 18:23:08 fraggle
+// Exit with an error when playing a demo with the wrong version, like Vanilla Doom
+//
// Revision 1.22 2006/01/23 00:12:25 fraggle
// Fix dehacked sky replacement
//
@@ -111,7 +114,7 @@
static const char
-rcsid[] = "$Id: g_game.c 332 2006-01-23 00:12:25Z fraggle $";
+rcsid[] = "$Id: g_game.c 351 2006-01-27 18:23:08Z 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++;