Commit a3fdcf0a authored by Marwolf's avatar Marwolf 💬

Prevents zoom while any custom interface is visible

parent c6c4841c
......@@ -80,7 +80,11 @@ public class InputImpl implements OnGestureListener, OnKeyListener, OnTouchListe
lastScrollOrRotate = System.currentTimeMillis();
if (mudclient.auctionHouse.isVisible() || mudclient.onlineList.isVisible() || mudclient.messageTabSelected != MessageTab.ALL)
// Disables zoom while visible
if (mudclient.auctionHouse.isVisible() || mudclient.onlineList.isVisible() || mudclient.skillGuideInterface.isVisible()
|| mudclient.questGuideInterface.isVisible() || mudclient.clan.getClanInterface().isVisible() || mudclient.experienceConfigInterface.isVisible()
|| mudclient.ironmanInterface.isVisible() || mudclient.achievementInterface.isVisible() || mudclient.doSkillInterface.isVisible()
|| mudclient.lostOnDeathInterface.isVisible() || mudclient.territorySignupInterface.isVisible() || mudclient.messageTabSelected != MessageTab.ALL)
return false;
if (mudclient.showUiTab == 0) {
......
......@@ -653,15 +653,15 @@ public final class mudclient implements Runnable {
private ProgressBarInterface batchProgressBar;
private BankPinInterface bankPinInterface;
private FishingTrawlerInterface fishingTrawlerInterface;
private AchievementGUI achievementInterface;
private IronManInterface ironmanInterface;
public AchievementGUI achievementInterface;
public IronManInterface ironmanInterface;
public AuctionHouse auctionHouse;
private SkillGuideInterface skillGuideInterface;
private QuestGuideInterface questGuideInterface;
private ExperienceConfigInterface experienceConfigInterface;
private DoSkillInterface doSkillInterface;
private LostOnDeathInterface lostOnDeathInterface;
private TerritorySignupInterface territorySignupInterface;
public SkillGuideInterface skillGuideInterface;
public QuestGuideInterface questGuideInterface;
public ExperienceConfigInterface experienceConfigInterface;
public DoSkillInterface doSkillInterface;
public LostOnDeathInterface lostOnDeathInterface;
public TerritorySignupInterface territorySignupInterface;
private String skillGuideChosen;
private String questGuideChosen;
private int questGuideProgress;
......
......@@ -375,8 +375,14 @@ public class ORSCApplet extends Applet implements MouseListener, MouseMotionList
public final synchronized void mouseWheelMoved(MouseWheelEvent e) {
updateControlShiftState(e);
mudclient.runScroll(e.getWheelRotation());
if (mudclient.auctionHouse.isVisible() || mudclient.onlineList.isVisible() || mudclient.messageTabSelected != MessageTab.ALL) // disables zoom while visible
// Disables zoom while visible
if (mudclient.auctionHouse.isVisible() || mudclient.onlineList.isVisible() || mudclient.skillGuideInterface.isVisible()
|| mudclient.questGuideInterface.isVisible() || mudclient.clan.getClanInterface().isVisible() || mudclient.experienceConfigInterface.isVisible()
|| mudclient.ironmanInterface.isVisible() || mudclient.achievementInterface.isVisible() || mudclient.doSkillInterface.isVisible()
|| mudclient.lostOnDeathInterface.isVisible() || mudclient.territorySignupInterface.isVisible() || mudclient.messageTabSelected != MessageTab.ALL)
return;
if (mudclient.showUiTab == 0 && (S_ZOOM_VIEW_TOGGLE || mudclient.getLocalPlayer().isStaff())) {
e.consume();
final int zoomIncrement = 10;
......
......@@ -653,15 +653,15 @@ public final class mudclient implements Runnable {
private ProgressBarInterface batchProgressBar;
private BankPinInterface bankPinInterface;
private FishingTrawlerInterface fishingTrawlerInterface;
private AchievementGUI achievementInterface;
private IronManInterface ironmanInterface;
public AchievementGUI achievementInterface;
public IronManInterface ironmanInterface;
public AuctionHouse auctionHouse;
private SkillGuideInterface skillGuideInterface;
private QuestGuideInterface questGuideInterface;
private ExperienceConfigInterface experienceConfigInterface;
private DoSkillInterface doSkillInterface;
private LostOnDeathInterface lostOnDeathInterface;
private TerritorySignupInterface territorySignupInterface;
public SkillGuideInterface skillGuideInterface;
public QuestGuideInterface questGuideInterface;
public ExperienceConfigInterface experienceConfigInterface;
public DoSkillInterface doSkillInterface;
public LostOnDeathInterface lostOnDeathInterface;
public TerritorySignupInterface territorySignupInterface;
private String skillGuideChosen;
private String questGuideChosen;
private int questGuideProgress;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment