From 0768b5b8cce2aef1b00a15618d6bea046b505823 Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Sat, 4 Jan 2020 14:54:48 -0800 Subject: [PATCH] Renamed getSkill to getAction --- core/src/com/riiablo/CharData.java | 6 +++--- core/src/com/riiablo/screen/panel/ControlPanel.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/com/riiablo/CharData.java b/core/src/com/riiablo/CharData.java index 0dcc988f..2b2b99ef 100644 --- a/core/src/com/riiablo/CharData.java +++ b/core/src/com/riiablo/CharData.java @@ -338,11 +338,11 @@ public class CharData { } } - public int getSkill(int button) { - return getSkill(d2s.header.alternate, button); + public int getAction(int button) { + return getAction(d2s.header.alternate, button); } - public int getSkill(int alternate, int button) { + public int getAction(int alternate, int button) { return d2s.header.actions[alternate][button]; } diff --git a/core/src/com/riiablo/screen/panel/ControlPanel.java b/core/src/com/riiablo/screen/panel/ControlPanel.java index 708a9750..6f4d1a48 100644 --- a/core/src/com/riiablo/screen/panel/ControlPanel.java +++ b/core/src/com/riiablo/screen/panel/ControlPanel.java @@ -115,7 +115,7 @@ public class ControlPanel extends Table implements Disposable, EscapeController manaWidget = new ManaWidget(ctrlpnl.getTexture(numFrames - 2)); if (!DEBUG_MOBILE && Gdx.app.getType() == Application.ApplicationType.Desktop) { - int leftSkillId = Riiablo.charData.getSkill(Input.Buttons.LEFT); + int leftSkillId = Riiablo.charData.getAction(Input.Buttons.LEFT); if (leftSkillId > 0) { final Skills.Entry skill = Riiablo.files.skills.get(leftSkillId); final SkillDesc.Entry desc = Riiablo.files.skilldesc.get(skill.skilldesc); @@ -143,7 +143,7 @@ public class ControlPanel extends Table implements Disposable, EscapeController } }); - int rightSkillId = Riiablo.charData.getSkill(Input.Buttons.RIGHT); + int rightSkillId = Riiablo.charData.getAction(Input.Buttons.RIGHT); if (rightSkillId > 0) { final Skills.Entry skill = Riiablo.files.skills.get(rightSkillId); final SkillDesc.Entry desc = Riiablo.files.skilldesc.get(skill.skilldesc);