Pass std::span to piggy_find_sound
This commit is contained in:
parent
102d19ec28
commit
cba14b91e4
|
@ -126,7 +126,7 @@ grs_bitmap *read_extra_bitmap_d1_pig(std::span<const char> name, grs_bitmap &out
|
||||||
void read_sndfile(int required);
|
void read_sndfile(int required);
|
||||||
#endif
|
#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);
|
void piggy_read_bitmap_data(grs_bitmap * bmp);
|
||||||
|
|
||||||
|
|
|
@ -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 ds_load(int skip, const char * filename ) {
|
||||||
int i;
|
|
||||||
char rawname[100];
|
char rawname[100];
|
||||||
|
|
||||||
if (skip) {
|
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");
|
snprintf(rawname, sizeof(rawname), "Sounds/%s.%s", fname.data(), (GameArg.SndDigiSampleRate==SAMPLE_RATE_22K) ? "r22" : "raw");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
i = piggy_find_sound(fname.data());
|
const auto i = piggy_find_sound(fname);
|
||||||
if (i!=255) {
|
if (i!=255) {
|
||||||
return i;
|
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{}};
|
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);
|
PHYSFS_read(cfp, n.data.get(), 1, n.length);
|
||||||
n.freq = 11025;
|
n.freq = 11025;
|
||||||
i = piggy_register_sound(n, fname);
|
return piggy_register_sound(n, fname);
|
||||||
} else {
|
} else {
|
||||||
return 255;
|
return 255;
|
||||||
}
|
}
|
||||||
return i;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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;
|
const auto i = hashtable_search(&AllDigiSndNames, name.data());
|
||||||
|
|
||||||
i = hashtable_search( &AllDigiSndNames, name );
|
|
||||||
|
|
||||||
if ( i < 0 )
|
if ( i < 0 )
|
||||||
return 255;
|
return 255;
|
||||||
|
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue