deepblue/diabloweb
1
0
Fork 0
mirror of https://github.com/d07RiV/diabloweb.git synced 2026-07-03 11:51:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mpq compress fix

Browse Source
This commit is contained in:
d07riv
2019-08-26 04:35:35 +03:00
parent 5d5ee042a1
commit 8bc41e936e
2 changed files with 2914 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2908
src/mpqcmp/ListFile.txt Normal file
View File

File diff suppressed because it is too large Load Diff

10
src/mpqcmp/compress.js
View File

@@ -67,7 +67,9 @@ export default async function compress(mpq, progress) {
} }
const loader = file => e => { file.loaded = e.loaded; updateProgress(); }; const loader = file => e => { file.loaded = e.loaded; updateProgress(); };
const fHeader = {loaded: 0, weight: 1, total: mpq.size}; const mpqsize = mpq.size;
const fHeader = {loaded: 0, weight: 1, total: mpqsize};
fHeader.ready = readFile(mpq.slice(0, 32), loader(fHeader)); fHeader.ready = readFile(mpq.slice(0, 32), loader(fHeader));
files.push(fHeader); files.push(fHeader);
@@ -91,7 +93,7 @@ export default async function compress(mpq, progress) {
const blockTablePos = header[5]; const blockTablePos = header[5];
const hashTableSize = header[6]; const hashTableSize = header[6];
const blockTableSize = header[7]; const blockTableSize = header[7];
if (hashTablePos + hashTableSize * 16 > mpq.size || blockTablePos + blockTableSize * 16 > mpq.size) { if (hashTablePos + hashTableSize * 16 > mpqsize || blockTablePos + blockTableSize * 16 > mpqsize) {
throw Error('invalid MPQ file'); throw Error('invalid MPQ file');
} }
@@ -119,7 +121,7 @@ export default async function compress(mpq, progress) {
for (let i = 0; i < NUM_TASKS; ++i) { for (let i = 0; i < NUM_TASKS; ++i) {
tasks.push({ tasks.push({
entries: [], entries: [],
min: mpq.size, min: mpqsize,
max: 0, max: 0,
progress: 0, progress: 0,
}); });
@@ -139,7 +141,7 @@ export default async function compress(mpq, progress) {
const filePos = blockTable[index * 4]; const filePos = blockTable[index * 4];
const cSize = blockTable[index * 4 + 1]; const cSize = blockTable[index * 4 + 1];
const task = tasks[Math.floor(filePos * NUM_TASKS / mpq.size)]; const task = tasks[Math.floor(filePos * NUM_TASKS / mpqsize)];
task.entries.push(i); task.entries.push(i);
task.min = Math.min(task.min, filePos); task.min = Math.min(task.min, filePos);
task.max = Math.max(task.max, filePos + cSize); task.max = Math.max(task.max, filePos + cSize);