Project

General

Profile

« Previous | Next » 

Revision 5f54927b

Added by Leszek Koltunski over 2 years ago

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

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java
480 480

  
481 481
///////////////////////////////////////////////////////////////////////////////////////////////////
482 482

  
483
  public ObjectType intGetObjectType(int[] numLayers)
483
  public String getShortName()
484 484
    {
485
    switch(numLayers[0])
485
    switch(getNumLayers()[0])
486
      {
487
      case 2: return ObjectType.DIAM_2.name();
488
      case 3: return ObjectType.DIAM_3.name();
489
      case 4: return ObjectType.DIAM_4.name();
490
      }
491

  
492
    return ObjectType.DIAM_2.name();
493
    }
494

  
495
///////////////////////////////////////////////////////////////////////////////////////////////////
496

  
497
  public long getSignature()
498
    {
499
    switch(getNumLayers()[0])
486 500
      {
487
      case 2: return ObjectType.DIAM_2;
488
      case 3: return ObjectType.DIAM_3;
489
      case 4: return ObjectType.DIAM_4;
501
      case 2: return ObjectType.DIAM_2.ordinal();
502
      case 3: return ObjectType.DIAM_3.ordinal();
503
      case 4: return ObjectType.DIAM_4.ordinal();
490 504
      }
491 505

  
492
    return ObjectType.DIAM_2;
506
    return ObjectType.DIAM_2.ordinal();
493 507
    }
494 508

  
495 509
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff