diff --git a/core/src/test/java/com/riiablo/asset/loader/Dc6LoaderTest.java b/core/src/test/java/com/riiablo/asset/loader/Dc6LoaderTest.java index 7261f487..ff7fd3a2 100644 --- a/core/src/test/java/com/riiablo/asset/loader/Dc6LoaderTest.java +++ b/core/src/test/java/com/riiablo/asset/loader/Dc6LoaderTest.java @@ -70,12 +70,12 @@ public class Dc6LoaderTest { @ParameterizedTest @CsvSource(value = { - "data\\global\\monsters\\ty\\ra\\tyralitnuhth.dc6,0,false", - "data\\global\\ui\\panel\\invchar6.dc6,0,true", + "data\\global\\monsters\\ty\\ra\\tyralitnuhth.dc6,0,0", + "data\\global\\ui\\panel\\invchar6.dc6,0,1", }, delimiter = ',') void load(String dccName, String szDirection, String szCombineFrames) throws Throwable { int direction = NumberUtils.toInt(szDirection); - boolean combineFrames = Boolean.parseBoolean(szCombineFrames); + int combineFrames = NumberUtils.toInt(szCombineFrames); AssetDesc asset = AssetDesc.of(dccName, Dc6.class, DcParams.of(direction, combineFrames)); EventExecutor executor = ImmediateEventExecutor.INSTANCE; final Promise promise = executor.newPromise(); @@ -134,7 +134,7 @@ public class Dc6LoaderTest { Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); batch.setBlendMode(NONE); batch.begin(palette.texture()); - if (combineFrames) { + if (combineFrames > 0) { batch.draw(dc6.page(0), 0, 0); batch.end(); return; diff --git a/core/src/test/java/com/riiablo/asset/loader/DccLoaderTest.java b/core/src/test/java/com/riiablo/asset/loader/DccLoaderTest.java index ea49ac3d..ffb68449 100644 --- a/core/src/test/java/com/riiablo/asset/loader/DccLoaderTest.java +++ b/core/src/test/java/com/riiablo/asset/loader/DccLoaderTest.java @@ -86,7 +86,7 @@ public class DccLoaderTest { "data\\global\\chars\\ba\\tr\\batrlittnhth.dcc", }) void fail(String dccName) throws Throwable { - AssetDesc asset = AssetDesc.of(dccName, Dcc.class, DcParams.of(0, true)); + AssetDesc asset = AssetDesc.of(dccName, Dcc.class, DcParams.of(0, 1)); EventExecutor executor = ImmediateEventExecutor.INSTANCE; final Promise promise = executor.newPromise(); LwjglApplicationConfiguration config = new LwjglApplicationConfiguration() {{ diff --git a/core/src/test/java/com/riiablo/file/Dc6DecoderTest.java b/core/src/test/java/com/riiablo/file/Dc6DecoderTest.java index 956670c6..620f3bcc 100644 --- a/core/src/test/java/com/riiablo/file/Dc6DecoderTest.java +++ b/core/src/test/java/com/riiablo/file/Dc6DecoderTest.java @@ -83,7 +83,7 @@ public class Dc6DecoderTest { void create0() { decoder.decode(dc6, 0); - dc6.uploadTextures(0, false); + dc6.uploadTextures(0, 0); String paletteName = "data\\global\\palette\\ACT1\\pal.dat"; AssetDesc paletteDesc = AssetDesc.of(paletteName, Palette.class, MpqParams.of()); diff --git a/core/src/test/java/com/riiablo/file/DccDecoderTest.java b/core/src/test/java/com/riiablo/file/DccDecoderTest.java index 3e7e4653..50077a51 100644 --- a/core/src/test/java/com/riiablo/file/DccDecoderTest.java +++ b/core/src/test/java/com/riiablo/file/DccDecoderTest.java @@ -191,7 +191,7 @@ public class DccDecoderTest { void create0() { decoder.decode(dcc, 0); - dcc.uploadTextures(0, false); + dcc.uploadTextures(0, 0); String paletteName = "data\\global\\palette\\ACT1\\pal.dat"; AssetDesc paletteDesc = AssetDesc.of(paletteName, Palette.class, MpqParams.of());