Project

General

Profile

« Previous | Next » 

Revision 7e4f3e04

Added by Leszek Koltunski almost 3 years ago

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

View differences:

src/main/java/org/distorted/screens/RubikScreenPlay.java
178 178
      @Override
179 179
      public void onClick(View view)
180 180
        {
181
         if( mPlayPopup==null )
181
        if( mPlayPopup==null )
182 182
          {
183 183
          float width = act.getScreenWidthInPixels();
184 184
          setupPlayWindow(act,width);
src/main/java/org/distorted/solvers/SolverMain.java
34 34
{
35 35
  private final Resources mRes;
36 36
  private final TwistyObject mObject;
37
  private final int mOrdinal;
37
  private final long mSignature;
38 38

  
39 39
///////////////////////////////////////////////////////////////////////////////////////////////////
40 40

  
41 41
  public SolverMain(Resources res, TwistyObject object)
42 42
    {
43
    mRes   = res;
44
    mObject= object;
45
    mOrdinal = object.getObjectType().ordinal();
43
    mRes       = res;
44
    mObject    = object;
45
    mSignature = object.getSignature();
46 46
    }
47 47

  
48 48
///////////////////////////////////////////////////////////////////////////////////////////////////
......
228 228
    {
229 229
    RubikScreenSolver solver = (RubikScreenSolver) ScreenList.SVER.getScreenClass();
230 230

  
231
    if( mOrdinal==ObjectConstants.CUBE_3 )
231
    if( mSignature==ObjectConstants.CUBE_3 )
232 232
      {
233 233
      solveCube3(solver);
234 234
      }
src/main/java/org/distorted/tutorials/TutorialScreen.java
31 31
import org.distorted.main.RubikActivity;
32 32
import org.distorted.objects.RubikObject;
33 33
import org.distorted.objects.RubikObjectList;
34
import org.distorted.screens.RubikScreenPlay;
35
import org.distorted.screens.ScreenList;
36 34
import org.distorted.helpers.TransparentImageButton;
37 35

  
38 36
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff