ref: b4082e71fc70f9295952b8c8c5cd77b85d602671
parent: fc15c99c8e943200e6c7da85f1046fd759514e16
author: Simon Howard <fraggle@gmail.com>
date: Thu Aug 31 14:13:23 EDT 2006
Check for 'ff_end' not 'ff_start' when displaying warning message about merging flats. Some old Vanilla WADs used ff_start..f_end to add extra flats and this message should not be displayed for them. Use American spelling of 'behavior'. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 582
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: d_main.c 563 2006-06-29 09:05:54Z fraggle $
+// $Id: d_main.c 582 2006-08-31 18:13:23Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -184,7 +184,7 @@
//-----------------------------------------------------------------------------
-static const char rcsid[] = "$Id: d_main.c 563 2006-06-29 09:05:54Z fraggle $";
+static const char rcsid[] = "$Id: d_main.c 582 2006-08-31 18:13:23Z fraggle $";
#define BGCOLOR 7
#define FGCOLOR 8
@@ -1479,7 +1479,7 @@
{if (gameversions[i].version == gameversion)
{- printf("Emulating the behaviour of the "+ printf("Emulating the behavior of the ""'%s' executable.\n", gameversions[i].description);
break;
}
@@ -1813,7 +1813,7 @@
novert = false;
if (W_CheckNumForName("SS_START") >= 0- || W_CheckNumForName("FF_START") >= 0)+ || W_CheckNumForName("FF_END") >= 0) { printf ("===========================================================================\n"); printf(" WARNING: The loaded WAD file contains modified sprites or\n"