diff options
| author | Wiimm <wiimm@wiimm.de> | 2020-11-30 16:16:56 +0100 |
|---|---|---|
| committer | Wiimm <wiimm@wiimm.de> | 2020-11-30 16:16:56 +0100 |
| commit | 9c0078c6b9c1309b48f9ece8b5cad1b9be9a75c5 (patch) | |
| tree | 0abd3b6a244076650e40a07e42adae9c2a6b2d8c /project/src/lib-brres.c | |
| parent | a0815499b2d9014695e6e261c909476729445360 (diff) | |
SZS v2.21a
Diffstat (limited to '')
| -rw-r--r-- | project/src/lib-brres.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/project/src/lib-brres.c b/project/src/lib-brres.c index 128fb33..f19cada 100644 --- a/project/src/lib-brres.c +++ b/project/src/lib-brres.c @@ -829,7 +829,11 @@ static int iterate_brres_group const brres_entry_t * entry_end = entry + n_entries; int stat = 0; + #if USE_ITERATOR_PARAM + if (it->itpar.cut_files) + #else if (it->cut_files) + #endif { it->index = 0; it->fst_item = 0; @@ -957,7 +961,11 @@ int IterateFilesBRRES //----- cut files? + #if USE_ITERATOR_PARAM + if (it->itpar.cut_files) + #else if (it->cut_files) + #endif { it->index = 0; it->fst_item = 0; @@ -1326,12 +1334,16 @@ int IterateStringsBRSUB it->fform = FF_UNKNOWN; - szs_iterator_t it2; - memset(&it2,0,sizeof(it2)); + szs_iterator_t it2 = {0}; it2.szs = it->szs; it2.size = it->file_size; it2.endian = it->endian; + //it2.clean_path = ; + #if USE_ITERATOR_PARAM // [[itpar]] copy itpar + it2.itpar.cut_files = true; + #else it2.cut_files = true; + #endif CutFilesBRSUB( &it2, brsub_string_func, it, 0, 0 ); return count + it2.index; } @@ -1721,7 +1733,7 @@ int DumpStructureBRRES if ( szs->fform_arch != FF_BRRES ) return -1; - return IterateFilesSZS(szs,dump_func,f,false,0,-1,SORT_NONE); + return IterateFilesParSZS(szs,dump_func,f,false,false,0,-1,SORT_NONE); } // @@ -1982,7 +1994,7 @@ enumError CreateNameRef nr->brief = brief; if ( szs->fform_arch == FF_BRRES ) - IterateFilesSZS( szs, iterate_nr_brres,nr, true,0,-1, SORT_NONE ); + IterateFilesParSZS( szs, iterate_nr_brres,nr, false,true,0,-1, SORT_NONE ); else iterate_nr_brsub(nr,szs,szs->data,szs->file_size,FF_UNKNOWN); #if 0 |