/ - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision 9b763e1c

Added by Leszek Koltunski about 3 years ago

ID 9b763e1cbc1878534db1b2037d39be5fc39e62f5
Parent 9e493af3
Child 7480fbab

Progress with marking objects as free

       private final String mLowerName, mUpperName;
       private final int mIconID;
       private final String[][] mPatterns;
       private final boolean mIsFree;
       private boolean mIsFree;
       private int mJsonID, mMeshID, mExtrasID;
       private int mObjectMinor, mExtrasMinor;
       private int mNumScramble;
-...
         return mIsFree;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void markFree()
+        {
         mIsFree = true;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public int getObjectMinor()

+        }
       private static ArrayList<DownloadedObject> mDownloadedObjects;
       private static String mFreeSolvedObjects;
       private static String mFreeBoughtObjects;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         return (ordinal>=0 && ordinal<mNumObjects) ? mObjects.get(ordinal).getMeshState() : MESH_NICE;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public static void saveMeshState(SharedPreferences.Editor editor)
+        {
         for(int i=0; i<mNumObjects; i++)
+          {
           RubikObject obj = getObject(i);
           if( obj!=null )
+            {
             String name = obj.getUpperName();
             editor.putInt("rol_"+name, obj.getMeshState() );
+            }
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public static void buyAll()
+        {
         mFreeBoughtObjects = "*";
         for(int i=0; i<mNumObjects; i++)
+          {
           RubikObject o = mObjects.get(i);
           o.markFree();
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public static boolean buyObject(String shortName)
+        {
         RubikObject o = getObject(shortName);
         if( o!=null && !o.isFree() )
+          {
           o.markFree();
           mFreeBoughtObjects += (","+shortName);
           return true;
+          }
         return false;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public static boolean solveObject(String shortName)
+        {
         RubikObject o = getObject(shortName);
         if( o!=null && !o.isFree() )
+          {
           o.markFree();
           mFreeSolvedObjects += (","+shortName);
           return true;
+          }
         return false;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public static void savePreferences(SharedPreferences.Editor editor)
-...
+          {
           editor.putString("rol_downloaded", "" );
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public static void saveMeshState(SharedPreferences.Editor editor)
+        {
         for(int i=0; i<mNumObjects; i++)
+          {
           RubikObject obj = getObject(i);
           if( obj!=null )
+            {
             String name = obj.getUpperName();
             editor.putInt("rol_"+name, obj.getMeshState() );
+            }
+          }
         editor.putString("rol_freeSolved", mFreeSolvedObjects);
         editor.putString("rol_freeBought", mFreeBoughtObjects);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         String objName= preferences.getString("rol_objName",defName);
         mObject = getOrdinal(objName);
         if( mObject<0 || mObject>=mNumObjects ) mObject = DEF_OBJECT;
         mFreeSolvedObjects = preferences.getString("rol_freeSolved", "");
         mFreeBoughtObjects = preferences.getString("rol_freeBought", "");
         if( mFreeBoughtObjects.length()>0 )
+          {
           if( mFreeBoughtObjects.charAt(0)=='*' )
+            {
             for(int i=0; i<mNumObjects; i++)
+              {
               RubikObject o = mObjects.get(i);
               o.markFree();
+              }
+            }
           else
+            {
             String[] objs = mFreeBoughtObjects.split(",");
             for( String obj : objs )
+              {
               RubikObject o = getObject(obj);
               if( o!=null ) o.markFree();
+              }
+            }
+          }
         if( mFreeSolvedObjects.length()>0 )
+          {
           String[] objs = mFreeSolvedObjects.split(",");
           for( String obj : objs )
+            {
             RubikObject o = getObject(obj);
             if( o!=null ) o.markFree();
+            }
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff

Project

General

Profile

Magic Cube

Revision 9b763e1c

Added by Leszek Koltunski about 3 years ago