commit 724ffa3ad42449850a8fb926de2cb16e1e924165
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Fri Jan 20 21:04:59 2006 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Fri Jan 20 21:04:59 2006 +0000
Import differences from stable branch.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 309
---
NEWS | 5 +++--
src/m_misc.c | 9 ++++++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/NEWS b/NEWS
index 3c630963..fba8a3fb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,13 @@
+0.1.3 (2006-01-20):
+
Imported the spechit overrun emulation code from prboom-plus. Thanks to
Andrey Budko for this.
New show_endoom option in the chocolate-doom.cfg config file allows
the ENDOOM screen to be disabled.
+ Chocolate Doom is now savegame-compatible with Vanilla Doom.
Fixes for big endian machines (thanks locust)
- Savegame fixes: we now load and save to the Vanilla Doom savegame
- format.
Fixed the behavior of the dehacked maximum health setting.
Fix the "-skill 0" hack to play without any items (thanks to Janizdreg
for pointing out that this was nonfunctional)
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 <stdio.h>
#include <stdlib.h>
@@ -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);
}