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

Pass std::span to piggy_find_sound

Browse source
This commit is contained in:
Kp 2022-12-17 13:16:28 +00:00
parent 102d19ec28
commit cba14b91e4
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -126,7 +126,7 @@ grs_bitmap *read_extra_bitmap_d1_pig(std::span<const char> name, grs_bitmap &out
void read_sndfile(int required);
#endif
}
int piggy_find_sound(const char *name);
int piggy_find_sound(std::span<const char> name);
void piggy_read_bitmap_data(grs_bitmap * bmp);

6
similar/main/bmread.cpp
View file

@ -380,7 +380,6 @@ static void ab_load(int skip, const char * filename, std::array<bitmap_index, MA
}
int ds_load(int skip, const char * filename ) {
int i;
char rawname[100];
if (skip) {
@ -397,7 +396,7 @@ int ds_load(int skip, const char * filename ) {
snprintf(rawname, sizeof(rawname), "Sounds/%s.%s", fname.data(), (GameArg.SndDigiSampleRate==SAMPLE_RATE_22K) ? "r22" : "raw");
#endif
i = piggy_find_sound(fname.data());
const auto i = piggy_find_sound(fname);
if (i!=255) {
return i;
}
@ -408,11 +407,10 @@ int ds_load(int skip, const char * filename ) {
n.data = digi_sound::allocated_data{std::make_unique<uint8_t[]>(n.length), game_sound_offset{}};
PHYSFS_read(cfp, n.data.get(), 1, n.length);
n.freq = 11025;
i = piggy_register_sound(n, fname);
return piggy_register_sound(n, fname);
} else {
return 255;
}
return i;
}
}

8
similar/main/piggy.cpp
View file

@ -424,15 +424,11 @@ bitmap_index piggy_find_bitmap(const std::span<const char> entry_name)
}
int piggy_find_sound(const char *name)
int piggy_find_sound(const std::span<const char> name)
{
int i;
i = hashtable_search( &AllDigiSndNames, name );
const auto i = hashtable_search(&AllDigiSndNames, name.data());
if ( i < 0 )
return 255;
return i;
}