TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed inconsistency in hostage_rescue() definition and revoked recent patch for u_mem.h due to infinite loops in mem.c caused by this

Browse source
This commit is contained in:
zicodxx 2012-10-31 16:26:45 +01:00
parent d2712f76c8
commit c5dbc6593c
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -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

7
include/u_mem.h
View file

@ -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

2
main/hostage.h
View file

@ -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