From 0e3449bae06b3c82fbd6361a9926146d22f7cd4c Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Sat, 9 Oct 2004 21:47:49 +0000 Subject: [PATCH] correct warnings caused by change of 2004-09-30 --- ChangeLog | 2 ++ cfile/cfile.c | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58865bad..45b0b104 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ use new macros PLAYING_BUILTIN_MISSION and EMULATING_D1 for accessing information about the current mission, for easier code refactorisation. + * cfile/cfile.c: correct warnings caused by change of 2004-09-30 + 2004-09-30 Martin Schaffner * cfile/cfile.c: simplify, reduce number of global vars diff --git a/cfile/cfile.c b/cfile/cfile.c index a04ee32d..0bc3ed33 100644 --- a/cfile/cfile.c +++ b/cfile/cfile.c @@ -1,4 +1,4 @@ -/* $Id: cfile.c,v 1.30 2004-09-29 22:40:28 schaffner Exp $ */ +/* $Id: cfile.c,v 1.31 2004-10-09 21:47:49 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -69,9 +69,9 @@ hog *builtin_hog = NULL; hog *alt_hog = NULL; hog *d1_hog = NULL; -void free_builtin_hog() { d_free (builtin_hog); } -void free_alt_hog() { d_free (alt_hog); } -void free_d1_hog() { d_free (d1_hog); } +void free_builtin_hog() { if (builtin_hog) d_free (builtin_hog); } +void free_alt_hog() { if (alt_hog) d_free (alt_hog); } +void free_d1_hog() { if (d1_hog) d_free (d1_hog); } char AltHogDir[64]; char AltHogdir_initialized = 0; @@ -287,6 +287,7 @@ int cfile_use_alternate_hogfile (char * name) return 0; } +/* we use the d1 hog for d1 textures... */ int cfile_use_descent1_hogfile( char * name ) { if (d1_hog) { -- 2.39.2