Merge remote-tracking branch 'Owain/2310-merge'

This commit is contained in:
Owain van Brakel
2019-10-31 18:54:24 +01:00
105 changed files with 1629 additions and 632 deletions

View File

@@ -1,3 +1,4 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
@@ -92,12 +93,13 @@ public class MusicPatchNode2 {
signature = "(Lhq;IIIZI)V",
garbageValue = "1856110966"
)
public static void method3830(AbstractArchive var0, int var1, int var2, int var3, boolean var4) {
@Export("playMusicTrack")
public static void playMusicTrack(AbstractArchive var0, int var1, int var2, int var3, boolean var4) {
class197.field2377 = 1;
class247.musicTrackArchive = var0;
class189.musicTrackGroupId = var1;
class197.musicTrackFileId = var2;
class197.field2379 = var3;
class197.musicTrackVolume = var3;
ScriptFrame.musicTrackBoolean = var4;
class197.field2384 = 10000;
}