diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java index bede7f3818..808adbff26 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java @@ -406,7 +406,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP outState.putBoolean(EXTRA_MENU_TOAST_SHOWN, mMenuToastShown); outState.putInt(EXTRA_SKYLANDER_SLOT, mSkylanderSlot); outState.putInt(EXTRA_SKYLANDER_ID, mSkylanderData.getId()); - outState.putInt(EXTRA_SKYLANDER_VAR, mSkylanderData.getVar()); + outState.putInt(EXTRA_SKYLANDER_VAR, mSkylanderData.getVariant()); outState.putString(EXTRA_SKYLANDER_NAME, mSkylanderData.getName()); super.onSaveInstanceState(outState); } @@ -546,10 +546,10 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP } else if (requestCode == REQUEST_CREATE_SKYLANDER) { - if (!(mSkylanderData.getId() == -1) && !(mSkylanderData.getVar() == -1)) + if (!(mSkylanderData.getId() == -1) && !(mSkylanderData.getVariant() == -1)) { Pair slot = SkylanderConfig.createSkylander(mSkylanderData.getId(), - mSkylanderData.getVar(), + mSkylanderData.getVariant(), result.getData().toString(), sSkylanderSlots.get(mSkylanderSlot).getPortalSlot()); clearSkylander(mSkylanderSlot); sSkylanderSlots.get(mSkylanderSlot).setPortalSlot(slot.first); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/model/Skylander.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/model/Skylander.java deleted file mode 100644 index b4c96a1a13..0000000000 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/model/Skylander.java +++ /dev/null @@ -1,37 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later - -package org.dolphinemu.dolphinemu.features.skylanders.model; - -public class Skylander -{ - private SkylanderPair mPair; - private String mName; - - public final static Skylander BLANK_SKYLANDER = new Skylander(-1, -1, "Blank"); - - public Skylander(int id, int var, String name) - { - mPair = new SkylanderPair(id, var); - mName = name; - } - - public String getName() - { - return mName; - } - - public void setName(String name) - { - this.mName = name; - } - - public int getId() - { - return mPair.getId(); - } - - public int getVar() - { - return mPair.getVar(); - } -} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/model/Skylander.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/model/Skylander.kt new file mode 100644 index 0000000000..021607baeb --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/model/Skylander.kt @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +package org.dolphinemu.dolphinemu.features.skylanders.model + +class Skylander(id: Int, variant: Int, var name: String) { + private val pair: SkylanderPair = SkylanderPair(id, variant) + + val id: Int get() = pair.id + val variant: Int get() = pair.variant + + companion object { + @JvmField + val BLANK_SKYLANDER = Skylander(-1, -1, "Blank") + } +}