Revision 400ff34d
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/main/RubikObjectLibInterface.java | ||
|---|---|---|
| 100 | 100 |
{
|
| 101 | 101 |
RubikScreenPlay play= (RubikScreenPlay) ScreenList.PLAY.getScreenClass(); |
| 102 | 102 |
RubikScores scores = RubikScores.getInstance(); |
| 103 |
|
|
| 104 |
int object = play.getObject(); |
|
| 103 |
int object = RubikObjectList.getCurrObject(); |
|
| 105 | 104 |
int level = play.getLevel(); |
| 106 | 105 |
String name = scores.getName(); |
| 107 | 106 |
RubikObject obj = RubikObjectList.getObject(object); |
| ... | ... | |
| 433 | 432 |
{
|
| 434 | 433 |
RubikScreenSolver solver = (RubikScreenSolver) ScreenList.SVER.getScreenClass(); |
| 435 | 434 |
int color = solver.getCurrentColor(); |
| 436 |
RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass(); |
|
| 437 |
int currObject = play.getObject(); |
|
| 435 |
int currObject = RubikObjectList.getCurrObject(); |
|
| 438 | 436 |
mLastCubitColor = SolverMain.cubitIsLocked(currObject,cubit); |
| 439 | 437 |
mLastCubit = cubit; |
| 440 | 438 |
mLastCubitFace = face; |
Also available in: Unified diff
Move the 'currObject' from RubikScreenPlay (WTF?) to RubikObjectList.