/ - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision 0c233a9a

Added by Leszek Koltunski about 3 years ago

ID 0c233a9af175ed54d455991574e7f932b88737ca
Parent 2cf21fdc
Child 8f84486b

Partly merge the 'iap' branch.

     import org.distorted.main.BuildConfig;
     import org.distorted.objects.RubikObject;
     import org.distorted.objects.RubikObjectList;
     import org.distorted.screens.RubikScreenPlay;
     import static org.distorted.objectlib.main.ObjectType.MAX_SCRAMBLES;
-...
     public class RubikScores
+      {
       public static final int RECORD_FIRST   = 0;
       public static final int RECORD_NEW     = 1;
       public static final int RECORD_NOT_NEW = 2;
       public static final int MAX_RECORD = 10;
       public static final int MULT = 1000000;
       public static final long NO_RECORD = Long.MAX_VALUE;
-...
       private int mNumPlays;
       private int mNumWins;
       private int mDeviceID;
       private int mNumStars;
       private static class MapValue
+        {
-...
         mNumRuns = -1;
         mDeviceID= -1;
         mNumWins =  0;
         mNumStars=  0;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         return mNumWins;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void changeNumStars(int stars)
+        {
         mNumStars += stars;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public int getNumStars()
+        {
         return mNumStars;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void setName(String newName)
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public synchronized boolean setRecord(int object, int level, long record)
       public synchronized int setRecord(int object, int level, long record)
+        {
         int key = mapKey(object,level);
         MapValue oldValue = mMap.get(key);
-...
+          {
           MapValue value = new MapValue(record,0);
           mMap.put(key,value);
           return true;
           return RECORD_FIRST;
+          }
         long oldRecord = oldValue.record;
-...
+          {
           MapValue value = new MapValue(record,0);
           mMap.put(key,value);
           return true;
           return RECORD_NEW;
+          }
         return false;
         return RECORD_NOT_NEW;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public synchronized long getRecord(int object, int level)
-...
         editor.putInt("scores_numRuns" , mNumRuns );
         editor.putInt("scores_deviceid", mDeviceID);
         editor.putInt("scores_review"  , mNumWins );
         editor.putInt("scores_review"  , mNumWins );   // legacy name
         editor.putInt("scores_numStars", mNumStars );
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         mNumRuns        = preferences.getInt("scores_numRuns" , 0);
         mDeviceID       = preferences.getInt("scores_deviceid",-1);
         mNumWins        = preferences.getInt("scores_review"  , 0);
         mNumStars       = preferences.getInt("scores_numStars", 0);
         if( mDeviceID==-1 ) mDeviceID = privateGetDeviceID();
         if( thereWasError ) recordDBError(errorStr);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public int numberOfSolvedMAXes()
+        {
         int numObjects = RubikObjectList.getNumObjects();
         int ret=0, level = RubikScreenPlay.LEVELS_SHOWN;
         for(int obj=0; obj<numObjects; obj++)
+          {
           if( isSolved(obj,level) ) ret++;
+          }
         return ret;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void recordDBError(String message)

     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public long getRecord()
       public long stopTimerAndGetRecord()
+        {
         if( mRunning )
+          {
           stopCounting();
           mElapsed = System.currentTimeMillis()-mStartTime;
           RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
           int object = RubikObjectList.getCurrObject();
           int level = play.getLevel()-1;
           boolean isNew = mScores.setRecord(object, level, mElapsed);
           return isNew ? mElapsed : -mElapsed;
           return mElapsed;
+          }
         return 0;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public int setRecord()
+        {
         RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
         int object = RubikObjectList.getCurrObject();
         int level = play.getLevel()-1;
         return mScores.setRecord(object, level, mElapsed);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void resetElapsed()

Also available in: Unified diff

Project

General

Profile

Magic Cube

Revision 0c233a9a

Added by Leszek Koltunski about 3 years ago