Better variable name.

This commit is contained in:
lzwdgc 2020-09-07 01:12:55 +03:00
parent 771c8e4697
commit 170fad79d7
2 changed files with 7 additions and 7 deletions

View file

@ -65,29 +65,29 @@ int record::read(pak *pak, void *output, int size)
int segment = file_start_pos / pak->h.chunk_size; int segment = file_start_pos / pak->h.chunk_size;
offset += size; offset += size;
pak->header[segment].decompress(segment); pak->segments[segment].decompress(segment);
auto file_start_pos2 = file_start_pos - segment * pak->h.chunk_size; auto file_start_pos2 = file_start_pos - segment * pak->h.chunk_size;
auto size3 = size; auto size3 = size;
if (pak->h.chunk_size - file_start_pos2 < size) if (pak->h.chunk_size - file_start_pos2 < size)
size3 = pak->h.chunk_size - file_start_pos2; size3 = pak->h.chunk_size - file_start_pos2;
memcpy(output, pak->header[segment].decoded + file_start_pos2, size3); memcpy(output, pak->segments[segment].decoded + file_start_pos2, size3);
auto size_diff = size - size3; auto size_diff = size - size3;
uint32_t diff = 0; uint32_t diff = 0;
for (char *out = (char *)output + size3; size_diff > 0; out += diff) for (char *out = (char *)output + size3; size_diff > 0; out += diff)
{ {
segment++; segment++;
pak->header[segment].decompress(segment); pak->segments[segment].decompress(segment);
diff = pak->h.chunk_size; diff = pak->h.chunk_size;
if (diff >= size_diff) if (diff >= size_diff)
diff = size_diff; diff = size_diff;
memcpy(out, pak->header[segment].decoded, 4 * (diff >> 2)); memcpy(out, pak->segments[segment].decoded, 4 * (diff >> 2));
size_diff -= diff; size_diff -= diff;
memcpy( memcpy(
out + 4 * (diff >> 2), out + 4 * (diff >> 2),
pak->header[segment].decoded + 4 * (diff >> 2), pak->segments[segment].decoded + 4 * (diff >> 2),
diff & 3); diff & 3);
} }
return size; return size;
@ -189,6 +189,6 @@ void pak::load(FILE *f)
t.file = f; t.file = f;
t.encoded = encoded.data(); t.encoded = encoded.data();
t.decoded = decoded.data(); t.decoded = decoded.data();
header.push_back(t); segments.push_back(t);
} }
} }

View file

@ -84,7 +84,7 @@ struct segment
struct pak struct pak
{ {
header h; header h;
vector<segment> header; vector<segment> segments;
map<string, record> files; map<string, record> files;
// //