Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-25 07:20:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed the supposed version check from ABK parsers

Browse Source 
The only reason I put it there is to distinguish old ABK from new ABK but then it turned out that they can have matching values in that field so... yeah, let's just do it another way
This commit is contained in:
NicknineTheEagle 2018-08-08 19:23:51 +03:00
parent e4c34b7c0b
commit ca9cfc6917
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/meta/ea_eaac.c
View File

@ -182,7 +182,7 @@ VGMSTREAM * init_vgmstream_ea_abk_new(STREAMFILE *streamFile) {
int is_dupe, total_sounds = 0, target_stream = streamFile->stream_index; int is_dupe, total_sounds = 0, target_stream = streamFile->stream_index;
off_t bnk_offset, header_table_offset, base_offset, unk_struct_offset, table_offset, snd_entry_offset, ast_offset; off_t bnk_offset, header_table_offset, base_offset, unk_struct_offset, table_offset, snd_entry_offset, ast_offset;
off_t num_entries_off, base_offset_off, entries_off, sound_table_offset_off; off_t num_entries_off, base_offset_off, entries_off, sound_table_offset_off;
uint32_t i, j, k, version, num_sounds, total_sound_tables; uint32_t i, j, k, num_sounds, total_sound_tables;
uint16_t num_tables, bnk_index, bnk_target_index; uint16_t num_tables, bnk_index, bnk_target_index;
uint8_t num_entries, extra_entries; uint8_t num_entries, extra_entries;
off_t sound_table_offsets[0x2000]; off_t sound_table_offsets[0x2000];
@ -197,11 +197,6 @@ VGMSTREAM * init_vgmstream_ea_abk_new(STREAMFILE *streamFile) {
if (read_32bitBE(0x00, streamFile) != 0x41424B43) /* "ABKC" */ if (read_32bitBE(0x00, streamFile) != 0x41424B43) /* "ABKC" */
goto fail; goto fail;
version = read_32bitBE(0x04, streamFile);
if (version != 0x01010100 &&
version != 0x01010202)
goto fail;
/* use table offset to check endianness */ /* use table offset to check endianness */
if (guess_endianness32bit(0x1C,streamFile)) { if (guess_endianness32bit(0x1C,streamFile)) {
read_32bit = read_32bitBE; read_32bit = read_32bitBE;

11
src/meta/ea_schl.c
View File

@ -156,7 +156,7 @@ fail:
VGMSTREAM * init_vgmstream_ea_abk(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_ea_abk(STREAMFILE *streamFile) {
int bnk_target_stream, is_dupe, total_sounds = 0, target_stream = streamFile->stream_index; int bnk_target_stream, is_dupe, total_sounds = 0, target_stream = streamFile->stream_index;
off_t bnk_offset, header_table_offset, base_offset, value_offset, table_offset, entry_offset, target_entry_offset, schl_offset; off_t bnk_offset, header_table_offset, base_offset, value_offset, table_offset, entry_offset, target_entry_offset, schl_offset;
uint32_t i, j, k, version, num_sounds, total_sound_tables; uint32_t i, j, k, num_sounds, total_sound_tables;
uint16_t num_tables; uint16_t num_tables;
uint8_t sound_type, num_entries; uint8_t sound_type, num_entries;
off_t sound_table_offsets[0x2000]; off_t sound_table_offsets[0x2000];
@ -172,15 +172,6 @@ VGMSTREAM * init_vgmstream_ea_abk(STREAMFILE *streamFile) {
if (read_32bitBE(0x00, streamFile) != 0x41424B43) /* "ABKC" */ if (read_32bitBE(0x00, streamFile) != 0x41424B43) /* "ABKC" */
goto fail; goto fail;
version = read_32bitBE(0x04, streamFile);
if (version != 0x01010000 &&
version != 0x01010100 &&
version != 0x01010200 &&
version != 0x02010000 &&
version != 0x02010100 &&
version != 0x02010202)
goto fail;
/* use table offset to check endianness */ /* use table offset to check endianness */
if (guess_endianness32bit(0x1C,streamFile)) { if (guess_endianness32bit(0x1C,streamFile)) {
read_32bit = read_32bitBE; read_32bit = read_32bitBE;