From c5dbc6593cdbe2ce0972f1e571f214169754afaa Mon Sep 17 00:00:00 2001 From: zicodxx Date: Wed, 31 Oct 2012 16:26:45 +0100 Subject: [PATCH] Fixed inconsistency in hostage_rescue() definition and revoked recent patch for u_mem.h due to infinite loops in mem.c caused by this --- CHANGELOG.txt | 4 ++++ include/u_mem.h | 7 +------ main/hostage.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 6fb01f027..19fd262f0 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,9 @@ D1X-Rebirth Changelog +20121031 +-------- +main/hostage.h, include/u_mem.h: Fixed inconsistency in hostage_rescue() definition and revoked recent patch for u_mem.h due to infinite loops in mem.c caused by this + 20120903 -------- arch/sdl/jukebox.c, main/gauges.c: Avoid some unnecessary strlen's - (slightly changed) patch by Kp diff --git a/include/u_mem.h b/include/u_mem.h index 30696224c..b310aa23c 100644 --- a/include/u_mem.h +++ b/include/u_mem.h @@ -21,10 +21,9 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifdef MACINTOSH extern ubyte virtual_memory_on; #endif +void mem_init(void); #if !defined(NDEBUG) - -void mem_init(void); void mem_display_blocks(); extern void * mem_malloc( unsigned int size, char * var, char * file, int line, int fill_zero ); extern void * mem_realloc( void * buffer, unsigned int size, char * var, char * file, int line ); @@ -44,10 +43,6 @@ void mem_validate_heap(); #else -static inline void mem_init(void) -{ -} - #ifdef macintosh extern char *strdup(const char *str); #endif diff --git a/main/hostage.h b/main/hostage.h index e09dc33e1..9f5c2fb90 100644 --- a/main/hostage.h +++ b/main/hostage.h @@ -148,7 +148,7 @@ extern vclip Hostage_face_clip[MAX_HOSTAGES]; extern hostage_data Hostages[MAX_HOSTAGES]; void draw_hostage(object *obj); -void hostage_rescue( int hostage_num ); +void hostage_rescue( int hostage_number ); void hostage_init(); //returns true if something drew