mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 18:19:43 +01:00
Code Issues Releases Wiki Activity

Replace all SDL_RWFromMem() with SDL_RWFromConstMem()

Browse source 
Since we're not going to be writing to any of these RWops, we might as
well just ensure that we don't by using SDL_RWFromConstMem().
This commit is contained in:
Misa 2021-02-22 20:21:12 -08:00 committed by Ethan Lee
parent 4a8c0a38ee
commit 3171a97160
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop_version/src/Music.cpp
View file

@ -92,7 +92,7 @@ void musicclass::init(void)
index = blob.getIndex(track_name); \ index = blob.getIndex(track_name); \
if (index >= 0 && index < blob.max_headers) \ if (index >= 0 && index < blob.max_headers) \
{ \ { \
rw = SDL_RWFromMem(blob.getAddress(index), blob.getSize(index)); \ rw = SDL_RWFromConstMem(blob.getAddress(index), blob.getSize(index)); \
if (rw == NULL) \ if (rw == NULL) \
{ \ { \
printf("Unable to read music file header: %s\n", SDL_GetError()); \ printf("Unable to read music file header: %s\n", SDL_GetError()); \
@ -110,7 +110,7 @@ void musicclass::init(void)
size_t index_ = 0; size_t index_ = 0;
while (mmmmmm_blob.nextExtra(&index_)) while (mmmmmm_blob.nextExtra(&index_))
{ {
rw = SDL_RWFromMem(mmmmmm_blob.getAddress(index_), mmmmmm_blob.getSize(index_)); rw = SDL_RWFromConstMem(mmmmmm_blob.getAddress(index_), mmmmmm_blob.getSize(index_));
musicTracks.push_back(MusicTrack( rw )); musicTracks.push_back(MusicTrack( rw ));
num_mmmmmm_tracks++; num_mmmmmm_tracks++;
@ -133,7 +133,7 @@ void musicclass::init(void)
size_t index_ = 0; size_t index_ = 0;
while (pppppp_blob.nextExtra(&index_)) while (pppppp_blob.nextExtra(&index_))
{ {
rw = SDL_RWFromMem(pppppp_blob.getAddress(index_), pppppp_blob.getSize(index_)); rw = SDL_RWFromConstMem(pppppp_blob.getAddress(index_), pppppp_blob.getSize(index_));
musicTracks.push_back(MusicTrack( rw )); musicTracks.push_back(MusicTrack( rw ));
num_pppppp_tracks++; num_pppppp_tracks++;

2
desktop_version/src/SoundSystem.cpp
View file

@ -38,7 +38,7 @@ SoundTrack::SoundTrack(const char* fileName)
fprintf(stderr, "Unable to load WAV file %s\n", fileName); fprintf(stderr, "Unable to load WAV file %s\n", fileName);
return; return;
} }
SDL_RWops *fileIn = SDL_RWFromMem(mem, length); SDL_RWops *fileIn = SDL_RWFromConstMem(mem, length);
sound = Mix_LoadWAV_RW(fileIn, 1); sound = Mix_LoadWAV_RW(fileIn, 1);
FILESYSTEM_freeMemory(&mem); FILESYSTEM_freeMemory(&mem);