commit 7e4f3e04d4686549388c450f24f4a3d86c310635
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Fri Feb 25 15:34:35 2022 +0100

    Preparation for local creation of puzzles: remove the 'ObjectType' enum from TwistyObject class.

diff --git a/src/main/java/org/distorted/screens/RubikScreenPlay.java b/src/main/java/org/distorted/screens/RubikScreenPlay.java
index 6a3d9275..c528111d 100644
--- a/src/main/java/org/distorted/screens/RubikScreenPlay.java
+++ b/src/main/java/org/distorted/screens/RubikScreenPlay.java
@@ -178,7 +178,7 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
       @Override
       public void onClick(View view)
         {
-         if( mPlayPopup==null )
+        if( mPlayPopup==null )
           {
           float width = act.getScreenWidthInPixels();
           setupPlayWindow(act,width);
diff --git a/src/main/java/org/distorted/solvers/SolverMain.java b/src/main/java/org/distorted/solvers/SolverMain.java
index c999dd23..5d682a56 100644
--- a/src/main/java/org/distorted/solvers/SolverMain.java
+++ b/src/main/java/org/distorted/solvers/SolverMain.java
@@ -34,15 +34,15 @@ public class SolverMain implements Runnable
 {
   private final Resources mRes;
   private final TwistyObject mObject;
-  private final int mOrdinal;
+  private final long mSignature;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public SolverMain(Resources res, TwistyObject object)
     {
-    mRes   = res;
-    mObject= object;
-    mOrdinal = object.getObjectType().ordinal();
+    mRes       = res;
+    mObject    = object;
+    mSignature = object.getSignature();
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -228,7 +228,7 @@ public class SolverMain implements Runnable
     {
     RubikScreenSolver solver = (RubikScreenSolver) ScreenList.SVER.getScreenClass();
 
-    if( mOrdinal==ObjectConstants.CUBE_3 )
+    if( mSignature==ObjectConstants.CUBE_3 )
       {
       solveCube3(solver);
       }
diff --git a/src/main/java/org/distorted/tutorials/TutorialScreen.java b/src/main/java/org/distorted/tutorials/TutorialScreen.java
index d953091a..4f246dde 100644
--- a/src/main/java/org/distorted/tutorials/TutorialScreen.java
+++ b/src/main/java/org/distorted/tutorials/TutorialScreen.java
@@ -31,8 +31,6 @@ import org.distorted.main.R;
 import org.distorted.main.RubikActivity;
 import org.distorted.objects.RubikObject;
 import org.distorted.objects.RubikObjectList;
-import org.distorted.screens.RubikScreenPlay;
-import org.distorted.screens.ScreenList;
 import org.distorted.helpers.TransparentImageButton;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////