Revision 400ff34d
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/main/RubikActivity.java | ||
|---|---|---|
| 256 | 256 |
scores.setCountry(this); |
| 257 | 257 |
} |
| 258 | 258 |
|
| 259 |
RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass(); |
|
| 260 |
int object = play.getObject(); |
|
| 259 |
int object = RubikObjectList.getCurrObject(); |
|
| 261 | 260 |
changeIfDifferent(object,view.getObjectControl()); |
| 262 | 261 |
|
| 263 | 262 |
if( mIsChinese && !mPolicyAccepted ) PrivacyPolicy(); |
| ... | ... | |
| 307 | 306 |
ScreenList.getScreen(i).getScreenClass().savePreferences(editor); |
| 308 | 307 |
} |
| 309 | 308 |
|
| 309 |
RubikObjectList.savePreferences(editor); |
|
| 310 | 310 |
ScreenList.savePreferences(editor); |
| 311 | 311 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 312 | 312 |
view.getObjectControl().savePreferences(editor); |
| ... | ... | |
| 333 | 333 |
ScreenList.getScreen(i).getScreenClass().restorePreferences(preferences); |
| 334 | 334 |
} |
| 335 | 335 |
|
| 336 |
RubikObjectList.restorePreferences(preferences); |
|
| 336 | 337 |
ScreenList.restorePreferences(preferences); |
| 337 | 338 |
|
| 338 | 339 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
Also available in: Unified diff
Move the 'currObject' from RubikScreenPlay (WTF?) to RubikObjectList.