Project

General

Profile

« Previous | Next » 

Revision 88bad160

Added by Leszek Koltunski about 3 years ago

Use the latest objectlib

View differences:

src/main/java/org/distorted/screens/RubikScreenPlay.java
519 519
  private void adjustLevels(final RubikActivity act)
520 520
    {
521 521
    int dbLevel = getDBLevel(mObject);
522
    int numScrambles = ObjectType.getNumScramble(mObject.ordinal());
522
    int numScrambles = mObject.getNumScramble();
523 523
    int numLevel = Math.min(dbLevel, LEVELS_SHOWN);
524 524
    String[] levels = new String[numLevel];
525 525

  
......
612 612
      case SKEW_3: return 17;
613 613
      case REX_3 : return 16;
614 614
      case MIRR_3: return 16;
615
      default    : return ObjectType.getNumScramble(object.ordinal());
615
      default    : return object.getNumScramble();
616 616
      }
617 617
    }
618 618

  
src/main/java/org/distorted/tutorials/TutorialScreen.java
74 74
      public void onClick(View v)
75 75
        {
76 76
        RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
77
        int ordinal = play.getObject().ordinal();
78
        int numScrambles = ObjectType.getNumScramble(ordinal);
77
        int numScrambles = play.getObject().getNumScramble();
79 78
        act.getControl().scrambleObject(numScrambles);
80 79
        }
81 80
      });

Also available in: Unified diff