Project

General

Profile

« Previous | Next » 

Revision 7ac0ee88

Added by Leszek Koltunski over 2 years ago

Simplify ObjectList: now there's just one object per size.

View differences:

src/main/java/org/distorted/screens/RubikScreenAbstract.java
35 35 
    {
36 36 
    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
37 37 
    int obj  = play.getObject();
38 
    int size = play.getSize();
39 
    int ret = RubikPatternList.getOrdinal(obj,size);
38 
    int ret = RubikPatternList.getOrdinal(obj);
40 39 

  		




  41
  40
  
    
    if( ret<0 )


  		




  42
  41
  
    
      {


  		




  43
  
  
    
      ret = ObjectList.getSizeIndex(RubikScreenPlay.DEF_OBJECT, RubikScreenPlay.DEF_SIZE);


  		




  
  42
  
    
      ret = RubikPatternList.getOrdinal(RubikScreenPlay.DEF_OBJECT);


  		




  44
  43
  
    
      }


  		




  45
  44
  
    

  		




  46
  45
  
    
    return ret;


  		




  ......




  52
  51
  
    
    {


  		




  53
  52
  
    
    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();


  		




  54
  53
  
    
    int obj  = play.getObject();


  		




  55
  
  
    
    int size = play.getSize();


  		




  56
  54
  
    

  		




  57
  
  
    
    int ret = TutorialList.getOrdinal(obj,size);


  		




  
  55
  
    
    int ret = TutorialList.getOrdinal(obj);


  		




  58
  56
  
    

  		




  59
  57
  
    
    if( ret<0 )


  		




  60
  58
  
    
      {


  		




  61
  
  
    
      ret = ObjectList.getSizeIndex(RubikScreenPlay.DEF_OBJECT, RubikScreenPlay.DEF_SIZE);


  		




  
  59
  
    
      ret = TutorialList.getOrdinal(RubikScreenPlay.DEF_OBJECT);


  		




  62
  60
  
    
      }


  		




  63
  61
  
    

  		




  64
  62
  
    
    return ret;


  		












Also available in:  Unified diff