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/RubikDialogPattern.java
131 131

  
132 132
  private int getPatternOrdinal()
133 133
    {
134
    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
135
    int obj  = play.getObject();
134
    int obj = RubikObjectList.getCurrObject();
136 135
    int ret = RubikPatternList.getOrdinal(obj);
137 136

  
138 137
    if( ret<0 )
139 138
      {
140
      ret = RubikPatternList.getOrdinal(RubikScreenPlay.DEF_OBJECT);
139
      ret = RubikPatternList.getOrdinal(RubikObjectList.DEF_OBJECT);
141 140
      }
142 141

  
143 142
    return ret;

Also available in: Unified diff