lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some few comments

Browse source
This commit is contained in:
Steel Titanium 2019-07-09 00:19:21 -04:00
parent e112856265
commit 21c6836fe0
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/sdl/mixer_sound.c
View file

@ -1116,6 +1116,12 @@ boolean I_LoadSong(char *data, size_t len)
size_t probesize; size_t probesize;
int result; int result;
/*
If the size of the data to be checked is bigger than the recommended size (> 2048)
Let's just set the probe size to the recommended size
Otherwise let's give it the full data size
*/
if (len > openmpt_probe_file_header_get_recommended_size()) if (len > openmpt_probe_file_header_get_recommended_size())
probesize = openmpt_probe_file_header_get_recommended_size(); probesize = openmpt_probe_file_header_get_recommended_size();
else else
@ -1126,7 +1132,7 @@ boolean I_LoadSong(char *data, size_t len)
if (result == OPENMPT_PROBE_FILE_HEADER_RESULT_SUCCESS) // We only cared if it succeeded, continue on if not. if (result == OPENMPT_PROBE_FILE_HEADER_RESULT_SUCCESS) // We only cared if it succeeded, continue on if not.
{ {
openmpt_mhandle = openmpt_module_create_from_memory2(data, len, NULL, NULL, NULL, NULL, NULL, NULL, NULL); openmpt_mhandle = openmpt_module_create_from_memory2(data, len, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
if (!openmpt_mhandle) if (!openmpt_mhandle) // Failed to create module handle? Show error and return!
{ {
mod_err = openmpt_module_error_get_last(openmpt_mhandle); mod_err = openmpt_module_error_get_last(openmpt_mhandle);
mod_err_str = openmpt_error_string(mod_err); mod_err_str = openmpt_error_string(mod_err);
@ -1134,10 +1140,11 @@ boolean I_LoadSong(char *data, size_t len)
return false; return false;
} }
else else
return true; return true; // All good and we're ready for music playback!
} }
#endif #endif
// Let's see if Mixer is able to load this.
rw = SDL_RWFromMem(data, len); rw = SDL_RWFromMem(data, len);
if (rw != NULL) if (rw != NULL)
{ {
@ -1149,7 +1156,6 @@ boolean I_LoadSong(char *data, size_t len)
return false; return false;
} }
// Find the OGG loop point. // Find the OGG loop point.
loop_point = 0.0f; loop_point = 0.0f;
song_length = 0.0f; song_length = 0.0f;