/ - Diff - TwistyPuzzleLib - Distorted Android

« Previous | Next »

Revision 36f6390b

still return the right value in case of slow and fast scrambling.

src/main/java/org/distorted/objectlib/main/ObjectControl.java
720	720	{
721	721	if( !mBeginningRotation && !mContinuingRotation )
722	722	{
723		mPreRender.scrambleObject(num);
724		return true;
	723	return mPreRender.scrambleObject(num);
725	724	}
726	725	return false;
727	726	}
...	...
733	732	{
734	733	if( !mBeginningRotation && !mContinuingRotation )
735	734	{
736		mPreRender.fastScrambleObject(duration,num);
737		return true;
	735	return mPreRender.fastScrambleObject(duration,num);
738	736	}
739	737	return false;
740	738	}

src/main/java/org/distorted/objectlib/main/ObjectPreRender.java
645	645
646	646	///////////////////////////////////////////////////////////////////////////////////////////////////
647	647
648		public void scrambleObject(int num)
	648	public boolean scrambleObject(int num)
649	649	{
650	650	if( !mScramblingAndSolvingBlocked )
651	651	{
...	...
653	653	mScrambleObjectNum = num;
654	654	mDebug = "";
655	655	mScrambleStartTime = System.currentTimeMillis();
	656	return true;
656	657	}
	658	return false;
657	659	}
658	660
659	661	///////////////////////////////////////////////////////////////////////////////////////////////////
660	662
661		public void fastScrambleObject(int duration, int num)
	663	public boolean fastScrambleObject(int duration, int num)
662	664	{
663	665	if( !mScramblingAndSolvingBlocked )
664	666	{
...	...
667	669	mScrambleObjectDuration = duration;
668	670	mDebug = "";
669	671	mScrambleStartTime = System.currentTimeMillis();
	672	return true;
670	673	}
	674	return false;
671	675	}
672	676
673	677	///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff