Project

General

Profile

« Previous | Next » 

Revision 035fe333

Added by Leszek Koltunski almost 5 years ago

RubikCube: progress with scrambling

View differences:

src/main/java/org/distorted/effect/ScrambleEffect.java
183 183
    else
184 184
      {
185 185
      mLastVector = -1;
186

  
187
      if( mEffectReturned == mCubeEffectNumber+mNodeEffectNumber )
188
        {
189
        mListener.effectFinished(FAKE_EFFECT_ID);
190
        }
186 191
      }
187 192
    }
188 193

  
......
220 225
        if( mEffectReturned == mCubeEffectNumber+mNodeEffectNumber )
221 226
          {
222 227
          disassignEffects();
228

  
229
          if( mNumScramblesLeft==0 )
230
            {
231
            mListener.effectFinished(FAKE_EFFECT_ID);
232
            }
223 233
          }
224 234

  
225 235
        return;
......
238 248
        if( mEffectReturned == mCubeEffectNumber+mNodeEffectNumber )
239 249
          {
240 250
          disassignEffects();
251

  
252
          if( mNumScramblesLeft==0 )
253
            {
254
            mListener.effectFinished(FAKE_EFFECT_ID);
255
            }
241 256
          }
242 257

  
243 258
        return;
......
299 314
      {
300 315
      nodeEffects.abortById(mNodeEffects[i].getID());
301 316
      }
302

  
303
    mListener.effectFinished(FAKE_EFFECT_ID);
304 317
    }
305 318

  
306 319
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff