Project

General

Profile

« Previous | Next » 

Revision 400ff34d

Added by Leszek Koltunski over 2 years ago

Move the 'currObject' from RubikScreenPlay (WTF?) to RubikObjectList.

View differences:

src/main/java/org/distorted/screens/RubikScreenPattern.java
34 34 
import org.distorted.dialogs.RubikDialogPattern;
35 35 
import org.distorted.helpers.TransparentImageButton;
36 36 
import org.distorted.main.RubikActivity;
37 
import org.distorted.objects.RubikObjectList;
37 38 
import org.distorted.patterns.RubikPattern;
38 39 
import org.distorted.patterns.RubikPatternList;
39 40 

  		




  ......




  59
  60
  
    

  		




  60
  61
  
    
  void leaveScreen(RubikActivity act)


  		




  61
  62
  
    
    {


  		




  62
  
  
    
    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();


  		




  63
  63
  
    
    int object = RubikPatternList.getObject(mPatternOrdinal);


  		




  64
  64
  
    

  		




  65
  
  
    
    if( !play.setObject(act,object) )


  		




  
  65
  
    
    if( !RubikObjectList.setCurrObject(act,object) )


  		




  66
  66
  
    
      {


  		




  67
  67
  
    
      act.changeObject(object,false);


  		




  68
  68
  
    
      }


  		












Also available in:  Unified diff