From b4cd0914121ed6bf013efd502ad13005bddd482a Mon Sep 17 00:00:00 2001 From: Kp Date: Fri, 4 Dec 2015 03:36:32 +0000 Subject: [PATCH] Combine D1/D2 gamedata_close --- similar/main/bm.cpp | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/similar/main/bm.cpp b/similar/main/bm.cpp index fab0f7c97..b9accb5b1 100644 --- a/similar/main/bm.cpp +++ b/similar/main/bm.cpp @@ -121,6 +121,17 @@ static inline void bitmap_index_read_n(partial_range_t r, uint_f bitmap_index_read_n(fp, partial_range(r, n)); } +void gamedata_close() +{ + free_polygon_models(); +#if defined(DXX_BUILD_DESCENT_II) + bm_free_extra_objbitmaps(); +#endif + free_endlevel_data(); + rle_cache_close(); + piggy_close(); +} + /* * reads n tmap_info structs from a PHYSFS_file */ @@ -134,14 +145,6 @@ static void tmap_info_read(tmap_info &ti, PHYSFS_file *fp) ti.eclip_num = PHYSFSX_readInt(fp); } -void gamedata_close() -{ - free_polygon_models(); - free_endlevel_data(); - rle_cache_close(); - piggy_close(); -} - //----------------------------------------------------------------- // Initializes game properties data (including texture caching system) and sound data. int gamedata_init() @@ -263,15 +266,6 @@ static void tmap_info_read(tmap_info &ti, PHYSFS_file *fp) ti.slide_v = PHYSFSX_readShort(fp); } -void gamedata_close() -{ - free_polygon_models(); - bm_free_extra_objbitmaps(); - free_endlevel_data(); - rle_cache_close(); - piggy_close(); -} - //----------------------------------------------------------------- // Initializes game properties data (including texture caching system) and sound data. int gamedata_init()