Revision 1a206525
Added by Leszek Koltunski about 1 year ago
| src/main/java/org/distorted/main/MainActivity.java | ||
|---|---|---|
| 423 | 423 |
|
| 424 | 424 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 425 | 425 |
|
| 426 |
public void switchToPlay(RubikObject object, int scrambles, int level) |
|
| 426 |
public void switchToPlay(RubikObject object, int ordinal, int scrambles, int level)
|
|
| 427 | 427 |
{
|
| 428 | 428 |
Intent intent = new Intent(this, PlayActivity.class); |
| 429 | 429 |
intent.putExtra("level", level);
|
| 430 | 430 |
intent.putExtra("name", object.getUpperName());
|
| 431 | 431 |
intent.putExtra("scrambles", scrambles);
|
| 432 | 432 |
intent.putExtra("local", object.isLocal() );
|
| 433 |
intent.putExtra("ordinal", object.getObjectOrdinal() );
|
|
| 433 |
intent.putExtra("ordinal", ordinal );
|
|
| 434 | 434 |
startActivity(intent); |
| 435 | 435 |
} |
| 436 | 436 |
|
| src/main/java/org/distorted/main/MainObjectPopup.java | ||
|---|---|---|
| 212 | 212 |
mPopup.dismiss(); |
| 213 | 213 |
if( ll<0 ) scores.setRecord(mObjectOrdinal,ll,0); // remember we've entered the 'Free' |
| 214 | 214 |
// so that the button turns green |
| 215 |
act.switchToPlay(object,scrambles,ll); |
|
| 215 |
act.switchToPlay(object,mObjectOrdinal,scrambles,ll);
|
|
| 216 | 216 |
} |
| 217 | 217 |
}); |
| 218 | 218 |
} |
Also available in: Unified diff
bugfix