From 4bae1a1f1a75faef5664b6dcd2117d17f6f2381e Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 2 Oct 2003 04:05:19 +0000 Subject: [PATCH] make sure d1_texture_indices gets freed between levels --- ChangeLog | 5 +++++ main/bm.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb7754c3..765e72fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-10-01 Bradley Bell + + * main/bm.c: make sure d1_texture_indices gets freed between + levels + 2003-09-11 Martin Schaffner * main/piggy.h: fix size of d1 shareware descent.pig diff --git a/main/bm.c b/main/bm.c index 07174e37..9f354158 100644 --- a/main/bm.c +++ b/main/bm.c @@ -1,4 +1,4 @@ -/* $Id: bm.c,v 1.34 2003-08-03 22:00:14 btb Exp $ */ +/* $Id: bm.c,v 1.35 2003-10-02 04:05:19 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -268,11 +268,13 @@ void free_d1_texture_indices() { void bm_read_d1_texture_indices(CFILE *d1pig) { int i; - atexit(free_d1_texture_indices); + + free_d1_texture_indices(); cfseek(d1pig, 8, SEEK_SET); MALLOC(d1_Texture_indices, short, D1_MAX_TEXTURES); for (i = 0; i < D1_MAX_TEXTURES; i++) d1_Texture_indices[i] = cfile_read_short(d1pig); + atexit(free_d1_texture_indices); } // the following is old code for reading descent 1 textures. -- 2.39.2