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/dialogs/RubikDialogTutorial.java
43 43

  
44 44
import org.distorted.main.R;
45 45
import org.distorted.main.RubikActivity;
46
import org.distorted.objects.RubikObjectList;
46 47
import org.distorted.screens.RubikScreenPlay;
47 48
import org.distorted.screens.ScreenList;
48 49
import org.distorted.tutorials.TutorialList;
......
128 129

  
129 130
  private int getTutorialOrdinal()
130 131
    {
131
    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
132
    int obj = play.getObject();
133

  
132
    int obj = RubikObjectList.getCurrObject();
134 133
    int ret = TutorialList.getOrdinal(obj);
135 134

  
136 135
    if( ret<0 )
137 136
      {
138
      ret = TutorialList.getOrdinal(RubikScreenPlay.DEF_OBJECT);
137
      ret = TutorialList.getOrdinal(RubikObjectList.DEF_OBJECT);
139 138
      }
140 139

  
141 140
    return ret;

Also available in: Unified diff