Project

General

Profile

« Previous | Next » 

Revision 85b09df4

Added by Leszek Koltunski about 4 years ago

Reorganize UI of the Play state.

View differences:

src/main/java/org/distorted/scores/RubikScores.java
29 29

  
30 30
import static org.distorted.objects.RubikObjectList.MAX_SIZE;
31 31
import static org.distorted.objects.RubikObjectList.NUM_OBJECTS;
32
import static org.distorted.states.RubikStatePlay.MAX_SCRAMBLE;
32
import static org.distorted.states.RubikStatePlay.MAX_LEVEL;
33 33

  
34 34
///////////////////////////////////////////////////////////////////////////////////////////////////
35 35
// hold my own scores, and some other statistics.
......
52 52

  
53 53
  private RubikScores()
54 54
    {
55
    mRecords   = new long[NUM_OBJECTS][MAX_SIZE][MAX_SCRAMBLE];
56
    mSubmitted = new int [NUM_OBJECTS][MAX_SIZE][MAX_SCRAMBLE];
55
    mRecords   = new long[NUM_OBJECTS][MAX_SIZE][MAX_LEVEL];
56
    mSubmitted = new int [NUM_OBJECTS][MAX_SIZE][MAX_LEVEL];
57 57

  
58 58
    for(int i=0; i<NUM_OBJECTS; i++)
59 59
      for(int j=0; j<MAX_SIZE; j++)
60
        for(int k=0; k<MAX_SCRAMBLE; k++)
60
        for(int k=0; k<MAX_LEVEL; k++)
61 61
          {
62 62
          mRecords[i][j][k]   = NO_RECORD;
63 63
          mSubmitted[i][j][k] = 0;
......
111 111

  
112 112
      for(int size=0; size<length; size++)
113 113
        {
114
        for(int scramble=0; scramble<MAX_SCRAMBLE; scramble++)
114
        for(int scramble=0; scramble<MAX_LEVEL; scramble++)
115 115
          {
116 116
          if( mSubmitted[object][size][scramble]==0 && mRecords[object][size][scramble]<NO_RECORD )
117 117
            {
......
160 160
    int[] sizes;
161 161
    int length;
162 162

  
163
    for(int scramble=0; scramble<MAX_SCRAMBLE; scramble++)
163
    for(int scramble=0; scramble<MAX_LEVEL; scramble++)
164 164
      {
165 165
      builder.setLength(0);
166 166

  
......
202 202
    int object, sizeIndex, subm;
203 203
    long time;
204 204

  
205
    for(int scramble=0; scramble<MAX_SCRAMBLE; scramble++)
205
    for(int scramble=0; scramble<MAX_LEVEL; scramble++)
206 206
      {
207 207
      start = end = 0;
208 208
      recordStr = preferences.getString("scores_record"+scramble, "");
......
268 268
    {
269 269
    int maxsize = RubikObjectList.getObject(object).getSizes().length;
270 270

  
271
    if( object>=0 && object<NUM_OBJECTS && size>=0 && size<maxsize && scramble>=1 && scramble<=MAX_SCRAMBLE )
271
    if( object>=0 && object<NUM_OBJECTS && size>=0 && size<maxsize && scramble>=1 && scramble<=MAX_LEVEL )
272 272
      {
273 273
      if( mRecords[object][size][scramble-1]> timeTaken )
274 274
        {
......
310 310

  
311 311
    for(int i=0; i<NUM_OBJECTS; i++)
312 312
      for(int j=0; j<MAX_SIZE   ; j++)
313
        for(int k=0; k<MAX_SCRAMBLE; k++)
313
        for(int k=0; k<MAX_LEVEL; k++)
314 314
          {
315 315
          mSubmitted[i][j][k]=1;
316 316
          }
......
345 345
    {
346 346
    int maxsize = RubikObjectList.getObject(object).getSizes().length;
347 347

  
348
    if( object>=0 && object<NUM_OBJECTS && size>=0 && size<maxsize && scramble>=0 && scramble<MAX_SCRAMBLE )
348
    if( object>=0 && object<NUM_OBJECTS && size>=0 && size<maxsize && scramble>=0 && scramble<MAX_LEVEL )
349 349
      {
350 350
      return mRecords[object][size][scramble];
351 351
      }
......
359 359
    {
360 360
    int maxsize = RubikObjectList.getObject(object).getSizes().length;
361 361

  
362
    if( object>=0 && object<NUM_OBJECTS && size>=0 && size<maxsize && scramble>=0 && scramble<MAX_SCRAMBLE )
362
    if( object>=0 && object<NUM_OBJECTS && size>=0 && size<maxsize && scramble>=0 && scramble<MAX_LEVEL )
363 363
      {
364 364
      return mSubmitted[object][size][scramble]==1;
365 365
      }
......
422 422
      length = list.getSizes().length;
423 423

  
424 424
      for(int size=0; size<length; size++)
425
        for(int scramble=0; scramble<MAX_SCRAMBLE; scramble++)
425
        for(int scramble=0; scramble<MAX_LEVEL; scramble++)
426 426
          {
427 427
          if( mSubmitted[object][size][scramble]==0 && mRecords[object][size][scramble]<NO_RECORD )
428 428
            {

Also available in: Unified diff