Revision 4c0cd600
Added by Leszek Koltunski about 4 years ago
| src/main/java/org/distorted/scores/RubikScores.java | ||
|---|---|---|
| 228 | 228 |
submStr = subStr.substring(comma+1); |
| 229 | 229 |
|
| 230 | 230 |
object = RubikObjectList.getOrdinal(nameStr); |
| 231 |
size = RubikObjectList.getSize(object,Integer.parseInt(sizeStr)); |
|
| 232 |
time = Long.parseLong(timeStr); |
|
| 233 |
subm = Integer.parseInt(submStr); |
|
| 234 | 231 |
|
| 235 |
if( object>=0 && object< NUM_OBJECTS && size>=0 && size<MAX_SIZE && subm>=0 && subm<=1 )
|
|
| 232 |
if( object>=0 && object< NUM_OBJECTS ) |
|
| 236 | 233 |
{
|
| 237 |
mRecords [object][size][scramble] = time; |
|
| 238 |
mSubmitted[object][size][scramble] = subm; |
|
| 239 |
/* |
|
| 240 |
if( time<NO_RECORD ) |
|
| 234 |
size = RubikObjectList.getSize(object,Integer.parseInt(sizeStr)); |
|
| 235 |
time = Long.parseLong(timeStr); |
|
| 236 |
subm = Integer.parseInt(submStr); |
|
| 237 |
|
|
| 238 |
if( size>=0 && size<MAX_SIZE && subm>=0 && subm<=1 ) |
|
| 239 |
{
|
|
| 240 |
mRecords [object][size][scramble] = time; |
|
| 241 |
mSubmitted[object][size][scramble] = subm; |
|
| 242 |
} |
|
| 243 |
else |
|
| 241 | 244 |
{
|
| 242 |
android.util.Log.e("solv", "Set record for: object="+object+" size="+size+" scramble="+scramble+" time: "+time+" submitted: "+subm);
|
|
| 245 |
android.util.Log.e("solv", "error: size="+size+" subm="+subm);
|
|
| 243 | 246 |
} |
| 244 |
*/ |
|
| 245 | 247 |
} |
| 246 | 248 |
else |
| 247 | 249 |
{
|
| 248 |
android.util.Log.e("solv", "error: object="+object+" size="+size);
|
|
| 250 |
android.util.Log.e("solv", "error: object="+object);
|
|
| 249 | 251 |
} |
| 250 | 252 |
} |
| 251 | 253 |
} |
| ... | ... | |
| 270 | 272 |
{
|
| 271 | 273 |
if( mRecords[object][size][scramble-1]> timeTaken ) |
| 272 | 274 |
{
|
| 273 |
mRecords[object][size][scramble-1] = timeTaken; |
|
| 275 |
mRecords [object][size][scramble-1] = timeTaken; |
|
| 276 |
mSubmitted[object][size][scramble-1] = 0; |
|
| 274 | 277 |
return true; |
| 275 | 278 |
} |
| 276 | 279 |
} |
| ... | ... | |
| 421 | 424 |
|
| 422 | 425 |
for(int size=0; size<length; size++) |
| 423 | 426 |
for(int scramble=0; scramble<MAX_SCRAMBLE; scramble++) |
| 427 |
{
|
|
| 424 | 428 |
if( mSubmitted[object][size][scramble]==0 && mRecords[object][size][scramble]<NO_RECORD ) |
| 425 | 429 |
{
|
| 426 | 430 |
return true; |
| 427 | 431 |
} |
| 432 |
} |
|
| 428 | 433 |
} |
| 429 | 434 |
|
| 430 | 435 |
return false; |
Also available in: Unified diff
Change the series of Object buttons in the Play state into a PopupWindow.