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

Use std::span for load_bitmap_replacements argument level_name

Browse source
This commit is contained in:
Kp 2022-10-09 23:15:20 +00:00
parent 1d475d106c
commit 7c0fb7b12a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/fwd-piggy.h
View file

@ -115,7 +115,7 @@ void piggy_read_sounds(void);
void piggy_new_pigfile(std::span<char, FILENAME_LEN> pigname);
//loads custom bitmaps for current level
void load_bitmap_replacements(const char *level_name);
void load_bitmap_replacements(std::span<const char, FILENAME_LEN> level_name);
//if descent.pig exists, loads descent 1 texture bitmaps
void load_d1_bitmap_replacements();
/*

4
similar/main/piggy.cpp
View file

@ -1779,13 +1779,13 @@ int d1_tmap_num_unique(uint16_t d1_tmap_num)
}
void load_bitmap_replacements(const char *level_name)
void load_bitmap_replacements(const std::span<const char, FILENAME_LEN> level_name)
{
char ifile_name[FILENAME_LEN];
//first, free up data allocated for old bitmaps
free_bitmap_replacements();
change_filename_extension(ifile_name, level_name, "POG");
change_filename_extension(ifile_name, level_name.data(), "POG");
if (auto ifile = PHYSFSX_openReadBuffered(ifile_name).first)
{
int id,version;