Project

General

Profile

« Previous | Next » 

Revision b78ebd76

Added by Leszek Koltunski over 2 years ago

Simplifications

View differences:

src/main/java/org/distorted/objectlib/main/ObjectPreRender.java
200 200
  private void finishRotationNow()
201 201
    {
202 202
    mFinishRotation = false;
203
    blockEverything(BlockController.RUBIK_PLACE_0);
203
    blockEverything(BlockController.PLACE_0);
204 204
    mRotationFinishedID = mNewObject.finishRotationNow(this, mNearestAngle);
205 205

  
206 206
    if( mRotationFinishedID==0 ) // failed to add effect - should never happen
......
217 217

  
218 218
    if ( mNewObject==null || mNewObject.getObjectType()!=mNextObject )
219 219
      {
220
      blockEverything(BlockController.RUBIK_PLACE_1);
220
      blockEverything(BlockController.PLACE_1);
221 221
      createObjectNow(mNextObject, null);
222 222
      doEffectNow( BaseEffect.Type.SIZECHANGE );
223 223
      }
......
231 231

  
232 232
    if ( mNewObject==null || mNewObject.getObjectType()!=mNextObject)
233 233
      {
234
      blockEverything(BlockController.RUBIK_PLACE_2);
234
      blockEverything(BlockController.PLACE_2);
235 235
      createObjectNow(mNextObject, mNextMoves);
236 236
      doEffectNow( BaseEffect.Type.SIZECHANGE );
237 237
      }
......
247 247
    {
248 248
    mScrambleObject = false;
249 249
    mIsSolved       = false;
250
    blockEverything(BlockController.RUBIK_PLACE_3);
250
    blockEverything(BlockController.PLACE_3);
251 251
    doEffectNow( BaseEffect.Type.SCRAMBLE );
252 252
    }
253 253

  
......
256 256
  private void solveObjectNow()
257 257
    {
258 258
    mSolveObject = false;
259
    blockEverything(BlockController.RUBIK_PLACE_4);
259
    blockEverything(BlockController.PLACE_4);
260 260
    doEffectNow( BaseEffect.Type.SOLVE );
261 261
    }
262 262

  

Also available in: Unified diff