stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-31 13:40:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove song_length tag search

Browse source 
Because songs without this tag will skiplag when loading.
This commit is contained in:
mazmazz 2019-05-02 19:14:23 -04:00
parent 3e5b0c4531
commit 904b00e921
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/sdl/mixer_sound.c
View file

@ -902,11 +902,9 @@ boolean I_LoadSong(char *data, size_t len)
const char *key1 = "LOOP"; const char *key1 = "LOOP";
const char *key2 = "POINT="; const char *key2 = "POINT=";
const char *key3 = "MS="; const char *key3 = "MS=";
const char *key4 = "LENGTHMS=";
const size_t key1len = strlen(key1); const size_t key1len = strlen(key1);
const size_t key2len = strlen(key2); const size_t key2len = strlen(key2);
const size_t key3len = strlen(key3); const size_t key3len = strlen(key3);
const size_t key4len = strlen(key4);
char *p = data; char *p = data;
SDL_RWops *rw; SDL_RWops *rw;
@ -1053,14 +1051,8 @@ boolean I_LoadSong(char *data, size_t len)
// Everything that uses LOOPMS will work perfectly with SDL_Mixer. // Everything that uses LOOPMS will work perfectly with SDL_Mixer.
} }
} }
else if (fpclassify(song_length) == FP_ZERO && !strncmp(p, key4, key4len)) // is it LENGTHMS=?
{
p += key4len; // skip LENGTHMS
song_length = (float)(atoi(p) / 1000.0L);
}
if (fpclassify(loop_point) != FP_ZERO && fpclassify(song_length) != FP_ZERO && song_length > loop_point) // Got what we needed if (fpclassify(loop_point) != FP_ZERO) // Got what we needed
// the last case is a sanity check, in case the wide char searches were false matches.
break; break;
else // continue searching else // continue searching
p++; p++;