mirror of
https://github.com/ZDoom/gzdoom-last-svn.git
synced 2025-06-02 02:01:19 +00:00
1f492784df
Update to ZDoom r971: - Changed: For actors not being spawned on the floor P_FindFloorCeiling should be used to prevent them from dropping through 3DMIDTEX textures. - Fixed: AMageStaffFX2::IsOkayToAttack overwrote the projectile's angle variable. - Changed the types of object hash indices in FArchive from size_t to DWORD. This seems to fix crashes on GCC 64-bit builds when saving games. Not sure if it was a GCC bug or my bug, since it worked fine with VC++, but since the code that calculates the index only returns a DWORD, storing it as a size_t was rather pointless. - Added the C99 printf size specifiers 't' (ptrdiff_t) and 'z' (size_t) to FString::Format() so that I can fix all the problem printf strings that a 64-bit GCC compile finds. - Added Skulltag's PUFFGETSOWNER flag. - Fixed: Parsing sector special bit masks must be done backwards so that later definitions take precedence. - Added base translation tables for UDMF compatibility maps which only should handle the native line and sector types of each game. - Turned the inactive SILENT_INSTANT_FLOORS define into a compatibility option so that it can be (un)set in a map definition and the menu. git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@105 b0f79afe-0144-0410-b225-9a4edf0717df
112 lines
3.3 KiB
C++
112 lines
3.3 KiB
C++
/*
|
|
** m_alloc.cpp
|
|
** Wrappers for the malloc family of functions that count used bytes.
|
|
**
|
|
**---------------------------------------------------------------------------
|
|
** Copyright 1998-2008 Randy Heit
|
|
** All rights reserved.
|
|
**
|
|
** Redistribution and use in source and binary forms, with or without
|
|
** modification, are permitted provided that the following conditions
|
|
** are met:
|
|
**
|
|
** 1. Redistributions of source code must retain the above copyright
|
|
** notice, this list of conditions and the following disclaimer.
|
|
** 2. Redistributions in binary form must reproduce the above copyright
|
|
** notice, this list of conditions and the following disclaimer in the
|
|
** documentation and/or other materials provided with the distribution.
|
|
** 3. The name of the author may not be used to endorse or promote products
|
|
** derived from this software without specific prior written permission.
|
|
**
|
|
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
**---------------------------------------------------------------------------
|
|
**
|
|
*/
|
|
|
|
#include "i_system.h"
|
|
#include <malloc.h>
|
|
|
|
#ifndef _MSC_VER
|
|
#define _NORMAL_BLOCK 0
|
|
#define _malloc_dbg(s,b,f,l) malloc(s)
|
|
#define _realloc_dbg(p,s,b,f,l) realloc(p,s)
|
|
#endif
|
|
#ifndef _WIN32
|
|
#define _msize(p) malloc_usable_size(p) // from glibc/FreeBSD
|
|
#endif
|
|
|
|
#ifndef _DEBUG
|
|
void *M_Malloc(size_t size)
|
|
{
|
|
void *block = malloc(size);
|
|
|
|
if (block == NULL)
|
|
I_FatalError("Could not malloc %zu bytes", size);
|
|
|
|
GC::AllocBytes += _msize(block);
|
|
return block;
|
|
}
|
|
|
|
void *M_Realloc(void *memblock, size_t size)
|
|
{
|
|
if (memblock != NULL)
|
|
{
|
|
GC::AllocBytes -= _msize(memblock);
|
|
}
|
|
void *block = realloc(memblock, size);
|
|
if (block == NULL)
|
|
{
|
|
I_FatalError("Could not realloc %zu bytes", size);
|
|
}
|
|
GC::AllocBytes += _msize(block);
|
|
return block;
|
|
}
|
|
#else
|
|
#ifdef _MSC_VER
|
|
#include <crtdbg.h>
|
|
#endif
|
|
|
|
void *M_Malloc_Dbg(size_t size, const char *file, int lineno)
|
|
{
|
|
void *block = _malloc_dbg(size, _NORMAL_BLOCK, file, lineno);
|
|
|
|
if (block == NULL)
|
|
I_FatalError("Could not malloc %zu bytes", size);
|
|
|
|
GC::AllocBytes += _msize(block);
|
|
return block;
|
|
}
|
|
|
|
void *M_Realloc_Dbg(void *memblock, size_t size, const char *file, int lineno)
|
|
{
|
|
if (memblock != NULL)
|
|
{
|
|
GC::AllocBytes -= _msize(memblock);
|
|
}
|
|
void *block = _realloc_dbg(memblock, size, _NORMAL_BLOCK, file, lineno);
|
|
if (block == NULL)
|
|
{
|
|
I_FatalError("Could not realloc %zu bytes", size);
|
|
}
|
|
GC::AllocBytes += _msize(block);
|
|
return block;
|
|
}
|
|
#endif
|
|
|
|
void M_Free (void *block)
|
|
{
|
|
if (block != NULL)
|
|
{
|
|
GC::AllocBytes -= _msize(block);
|
|
free(block);
|
|
}
|
|
}
|