Combine D1/D2 gamedata_close

This commit is contained in:
Kp 2015-12-04 03:36:32 +00:00
parent 954d473d47
commit b4cd091412

View file

@ -121,6 +121,17 @@ static inline void bitmap_index_read_n(partial_range_t<bitmap_index *> 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()