- moved all code related to global ACS variables to p_acs.cpp where it belongs.

- fixed: The nextmap and nextsecret CCMDs need to call G_DeferedInitNew instead of G_InitNew.
- merged MAPINFO branch back into trunk.

SVN r1393 (trunk)
This commit is contained in:
Christoph Oelckers 2009-02-03 19:11:43 +00:00
commit 4bcd3faef8
51 changed files with 3021 additions and 2197 deletions

View file

@ -1110,6 +1110,7 @@ void FString::ReallocBuffer (size_t newlen)
#include <windows.h>
static HANDLE StringHeap;
const SIZE_T STRING_HEAP_SIZE = 64*1024;
#endif
FStringData *FStringData::Alloc (size_t strlen)
@ -1120,7 +1121,7 @@ FStringData *FStringData::Alloc (size_t strlen)
#ifdef _WIN32
if (StringHeap == NULL)
{
StringHeap = HeapCreate (0, 64*1024, 0);
StringHeap = HeapCreate (0, STRING_HEAP_SIZE, 0);
if (StringHeap == NULL)
{
throw std::bad_alloc();