650d07b8c1
- Converted A_Hexendecorations.cpp - Changed the lower decal spawning code to transfer the main decal's color if the lower decal's default color is the same as the main decal's. - Changed the decal stretcher back to use the specified size parameters as a scaling factor and not a destination size because this is more consistent with the rest of the decal code. Also adjusted the blood smear definition in DECALDEF and the description in the Wiki for this. - Added Jim's most recent fixes. SVN r77 (trunk)
70 lines
2.3 KiB
C++
70 lines
2.3 KiB
C++
/*
|
|
** m_alloc.cpp
|
|
** Wrappers for the malloc family of functions
|
|
**
|
|
**---------------------------------------------------------------------------
|
|
** Copyright 1998-2005 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.
|
|
**---------------------------------------------------------------------------
|
|
**
|
|
*/
|
|
|
|
#if !defined(_DEBUG) || !defined(_MSC_VER)
|
|
|
|
#include "i_system.h"
|
|
#include "m_alloc.h"
|
|
|
|
void *M_Malloc (size_t size)
|
|
{
|
|
void *zone = malloc (size);
|
|
|
|
if (!zone)
|
|
I_FatalError ("Could not malloc %u bytes", size);
|
|
|
|
return zone;
|
|
}
|
|
|
|
void *M_Calloc (size_t num, size_t size)
|
|
{
|
|
void *zone = calloc (num, size);
|
|
|
|
if (!zone)
|
|
I_FatalError ("Could not calloc %u bytes", num * size);
|
|
|
|
return zone;
|
|
}
|
|
|
|
void *M_Realloc (void *memblock, size_t size)
|
|
{
|
|
void *zone = realloc (memblock, size);
|
|
|
|
if (!zone)
|
|
I_FatalError ("Could not realloc %u bytes", size);
|
|
|
|
return zone;
|
|
}
|
|
|
|
#endif
|