Revision fcd5b990
Added by Leszek Koltunski almost 3 years ago
| src/main/java/org/distorted/main/RubikPreRender.java | ||
|---|---|---|
| 42 | 42 |
import org.distorted.objects.TwistyObject; |
| 43 | 43 |
import org.distorted.objects.ObjectList; |
| 44 | 44 |
import org.distorted.network.RubikScores; |
| 45 |
import org.distorted.states.RubikStatePlay;
|
|
| 46 |
import org.distorted.states.StateList;
|
|
| 47 |
import org.distorted.states.RubikStateSolving;
|
|
| 45 |
import org.distorted.screens.RubikScreenPlay;
|
|
| 46 |
import org.distorted.screens.ScreenList;
|
|
| 47 |
import org.distorted.screens.RubikScreenSolving;
|
|
| 48 | 48 |
|
| 49 | 49 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 50 | 50 |
|
| ... | ... | |
| 172 | 172 |
|
| 173 | 173 |
if( solved && !mIsSolved ) |
| 174 | 174 |
{
|
| 175 |
if( StateList.getCurrentState()== StateList.SOLV )
|
|
| 175 |
if( ScreenList.getCurrentState()== ScreenList.SOLV )
|
|
| 176 | 176 |
{
|
| 177 |
RubikStateSolving solving = (RubikStateSolving) StateList.SOLV.getStateClass();
|
|
| 177 |
RubikScreenSolving solving = (RubikScreenSolving) ScreenList.SOLV.getStateClass();
|
|
| 178 | 178 |
mNewRecord = solving.getRecord(); |
| 179 | 179 |
|
| 180 | 180 |
if( mNewRecord< 0 ) |
| ... | ... | |
| 349 | 349 |
|
| 350 | 350 |
private void reportRecord() |
| 351 | 351 |
{
|
| 352 |
RubikStatePlay play = (RubikStatePlay) StateList.PLAY.getStateClass();
|
|
| 352 |
RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getStateClass();
|
|
| 353 | 353 |
RubikScores scores = RubikScores.getInstance(); |
| 354 | 354 |
|
| 355 | 355 |
int object = play.getObject(); |
| ... | ... | |
| 693 | 693 |
@Override |
| 694 | 694 |
public void run() |
| 695 | 695 |
{
|
| 696 |
StateList.switchState( act, StateList.READ);
|
|
| 696 |
ScreenList.switchState( act, ScreenList.READ);
|
|
| 697 | 697 |
} |
| 698 | 698 |
}); |
| 699 | 699 |
} |
| 700 | 700 |
|
| 701 | 701 |
if( i==BaseEffect.Type.WIN.ordinal() ) |
| 702 | 702 |
{
|
| 703 |
if( StateList.getCurrentState()== StateList.SOLV )
|
|
| 703 |
if( ScreenList.getCurrentState()== ScreenList.SOLV )
|
|
| 704 | 704 |
{
|
| 705 | 705 |
final RubikActivity act = (RubikActivity)mView.getContext(); |
| 706 | 706 |
Bundle bundle = new Bundle(); |
| ... | ... | |
| 727 | 727 |
@Override |
| 728 | 728 |
public void run() |
| 729 | 729 |
{
|
| 730 |
StateList.switchState( act, StateList.DONE);
|
|
| 730 |
ScreenList.switchState( act, ScreenList.DONE);
|
|
| 731 | 731 |
} |
| 732 | 732 |
}); |
| 733 | 733 |
} |
Also available in: Unified diff
Rename 'state' to 'screen'