Project

General

Profile

« Previous | Next » 

Revision 8ab435b9

Added by Leszek Koltunski over 2 years ago

1. Remove 'db level' from objectlib (this belongs to the app!)
2. change ScreenPlay's 'mObject' to be an ObjectType.

View differences:

src/main/java/org/distorted/screens/RubikScreenAbstract.java
22 22 
import android.content.SharedPreferences;
23 23 

  		




  24
  24
  
    
import org.distorted.main.RubikActivity;


  		




  
  25
  
    
import org.distorted.objectlib.main.ObjectType;


  		




  25
  26
  
    
import org.distorted.patterns.RubikPatternList;


  		




  26
  27
  
    
import org.distorted.tutorials.TutorialList;


  		




  27
  28
  
    

  		




  ......




  32
  33
  
    
  int getPatternOrdinal()


  		




  33
  34
  
    
    {


  		




  34
  35
  
    
    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();


  		




  35
  
  
    
    int obj  = play.getObject();


  		




  
  36
  
    
    ObjectType obj  = play.getObject();


  		




  36
  37
  
    
    int ret = RubikPatternList.getOrdinal(obj);


  		




  37
  38
  
    

  		




  38
  39
  
    
    if( ret<0 )


  		




  ......




  48
  49
  
    
  int getTutorialOrdinal()


  		




  49
  50
  
    
    {


  		




  50
  51
  
    
    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();


  		




  51
  
  
    
    int obj  = play.getObject();


  		




  
  52
  
    
    ObjectType obj  = play.getObject();


  		




  52
  53
  
    

  		




  53
  54
  
    
    int ret = TutorialList.getOrdinal(obj);


  		




  54
  55
  
    

  		












Also available in:  Unified diff