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/RubikScreenPattern.java
63 63
  void leaveScreen(RubikActivity act)
64 64
    {
65 65
    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
66

  
67 66
    ObjectList object = RubikPatternList.getObject(mPatternOrdinal);
68
    int size = RubikPatternList.getSize(mPatternOrdinal);
69 67

  
70
    if( !play.setObjectAndSize(act,object,size) )
68
    if( !play.setObject(act,object) )
71 69
      {
72 70
      int objectPlay= play.getObject();
73
      int sizePlay  = play.getSize();
74 71

  
75
      act.changeObject(ObjectList.getObject(objectPlay),sizePlay, false);
72
      act.changeObject(ObjectList.getObject(objectPlay),false);
76 73
      }
77 74
    }
78 75

  

Also available in: Unified diff