Merge remote-tracking branch 'runelite/master' into 2009-merge

This commit is contained in:
Owain van Brakel
2019-09-30 09:29:23 +02:00
9 changed files with 89 additions and 11 deletions

View File

@@ -1564,6 +1564,7 @@ public final class SpriteID
public static final int MOBILE_FUNCTION_MODE_DISABLED = 1624;
public static final int MOBILE_YELLOW_TOUCH_ANIMATION_1 = 1625;
public static final int MOBILE_YELLOW_TOUCH_ANIMATION_2 = 1626;
public static final int MOBILE_FINGER_ON_INTERFACE = 1653;
/* Unmapped: 1627~1701 */
public static final int BUTTON_FRIENDS = 1702;
public static final int BUTTON_IGNORES = 1703;

View File

@@ -167,6 +167,10 @@ public enum VarPlayer
MUSIC_TRACKS_UNLOCKED_18(1681),
MUSIC_TRACKS_UNLOCKED_19(2065),
MUSIC_VOLUME(168),
SOUND_EFFECT_VOLUME(169),
AREA_EFFECT_VOLUME(872),
/**
* f2p Quest varbits, these don't hold the completion value.
*/