mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-02-20 19:49:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes #9

Browse Source
This commit is contained in:
Collin Smith 2019-03-20 17:42:51 -07:00
parent 6da8268c4a
commit 5863c1ce71
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/riiablo/mpq/MPQFileHandleResolver.java
View File

@ -66,10 +66,6 @@ public class MPQFileHandleResolver implements FileHandleResolver {
public FileHandle resolve(String fileName) {
if (DEBUG) Gdx.app.debug(TAG, "Resolving " + fileName);
if (fileName == null) return null;
if (fileName.endsWith("gem.wav")) {
return new MPQFileHandle(d2sfx, fileName);
}
for (MPQ mpq : mpqs) {
if (mpq.contains(fileName)) {
if (DEBUG) Gdx.app.debug(TAG, fileName + " found in " + mpq);

17
core/src/com/riiablo/mpq/MPQInputStream.java
View File

@ -6,6 +6,7 @@ import com.badlogic.gdx.utils.StreamUtils;
import com.riiablo.mpq.util.Decompressor;
import com.riiablo.mpq.util.Decryptor;
import com.riiablo.mpq.util.Exploder;
import com.riiablo.util.BufferUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
@ -18,11 +19,9 @@ import java.nio.ByteOrder;
import java.nio.channels.FileChannel;
import java.util.Arrays;
import com.riiablo.util.BufferUtils;
public class MPQInputStream extends InputStream {
private static final String TAG = "MPQInputStream";
private static final boolean DEBUG = false;
private static final boolean DEBUG = !true;
private static final int[] ZERO_ARRAY = new int[] { 0 };
@ -232,7 +231,11 @@ public class MPQInputStream extends InputStream {
if (DEBUG) Gdx.app.debug(TAG, "Exploding sector...");
final int FSize = Math.min(block.FSize - finalSize, sectorSize);
buffer.rewind().limit(FSize);
Exploder.pkexplode(sector, buffer);
if (CSize == sectorSize) {
buffer.put(sector);
} else {
Exploder.pkexplode(sector, buffer);
}
if (DEBUG) Gdx.app.debug(TAG, "Exploded to " + buffer.position() + " bytes");
buffer.rewind();
@ -363,7 +366,11 @@ public class MPQInputStream extends InputStream {
if (DEBUG) Gdx.app.debug(TAG, "Exploding sector...");
final int FSize = Math.min(block.FSize - finalSize, sectorSize);
ByteBuffer slice = BufferUtils.slice(buffer, FSize);
Exploder.pkexplode(sector, slice);
if (CSize == sectorSize) {
slice.put(sector);
} else {
Exploder.pkexplode(sector, slice);
}
if (DEBUG) Gdx.app.debug(TAG, "Exploded to " + slice.limit() + " bytes");
buffer.position(buffer.position() + slice.limit());
}