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/TwistyMirror.java
377 377

  
378 378
///////////////////////////////////////////////////////////////////////////////////////////////////
379 379

  
380
  public ObjectType intGetObjectType(int[] numLayers)
380
  public String getShortName()
381 381
    {
382
    switch(numLayers[0])
382
    switch(getNumLayers()[0])
383
      {
384
      case 2: return ObjectType.MIRR_2.name();
385
      case 3: return ObjectType.MIRR_3.name();
386
      case 4: return ObjectType.MIRR_4.name();
387
      }
388

  
389
    return ObjectType.MIRR_2.name();
390
    }
391

  
392
///////////////////////////////////////////////////////////////////////////////////////////////////
393

  
394
  public long getSignature()
395
    {
396
    switch(getNumLayers()[0])
383 397
      {
384
      case 2: return ObjectType.MIRR_2;
385
      case 3: return ObjectType.MIRR_3;
386
      case 4: return ObjectType.MIRR_4;
398
      case 2: return ObjectType.MIRR_2.ordinal();
399
      case 3: return ObjectType.MIRR_3.ordinal();
400
      case 4: return ObjectType.MIRR_4.ordinal();
387 401
      }
388 402

  
389
    return ObjectType.MIRR_2;
403
    return ObjectType.MIRR_2.ordinal();
390 404
    }
391 405

  
392 406
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff