From 724ffa3ad42449850a8fb926de2cb16e1e924165 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 20 Jan 2006 21:04:59 +0000 Subject: Import differences from stable branch. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 309 --- src/m_misc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/m_misc.c b/src/m_misc.c index f4db1506..4caf5659 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: m_misc.c 280 2006-01-10 22:14:13Z fraggle $ +// $Id: m_misc.c 309 2006-01-20 21:04:59Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -23,6 +23,9 @@ // // // $Log$ +// Revision 1.18 2006/01/20 21:04:59 fraggle +// Import differences from stable branch. +// // Revision 1.17 2006/01/10 22:14:13 fraggle // Shut up compiler warnings // @@ -98,7 +101,7 @@ //----------------------------------------------------------------------------- static const char -rcsid[] = "$Id: m_misc.c 280 2006-01-10 22:14:13Z fraggle $"; +rcsid[] = "$Id: m_misc.c 309 2006-01-20 21:04:59Z fraggle $"; #include #include @@ -631,7 +634,7 @@ void M_LoadDefaults (void) } else { - doom_defaults.filename = malloc(strlen(configdir) + 10); + doom_defaults.filename = malloc(strlen(configdir) + 20); sprintf(doom_defaults.filename, "%sdefault.cfg", configdir); } -- cgit v1.2.3