Revision 73709b89
Added by Leszek Koltunski about 2 years ago
src/main/java/org/distorted/objects/RubikObject.java | ||
---|---|---|
40 | 40 |
private final String mLowerName, mUpperName; |
41 | 41 |
private final int mIconID; |
42 | 42 |
private final String[][] mPatterns; |
43 |
private final boolean mIsFree; |
|
44 | 43 |
|
44 |
private boolean mIsFree; |
|
45 | 45 |
private int mJsonID, mMeshID, mExtrasID; |
46 | 46 |
private int mObjectMinor, mExtrasMinor; |
47 | 47 |
private int mNumScramble; |
... | ... | |
87 | 87 |
mLowerName = object.shortName; |
88 | 88 |
mUpperName = object.shortName.toUpperCase(Locale.ENGLISH); |
89 | 89 |
mNumScramble = object.numScrambles; |
90 |
mIsFree = object.free; |
|
90 | 91 |
mObjectMinor = object.objectMinor; |
91 | 92 |
mExtrasMinor = object.extrasMinor; |
92 |
mIsFree = object.free; |
|
93 | 93 |
|
94 | 94 |
mPatterns = null; |
95 | 95 |
mMeshState = MESH_NICE; |
... | ... | |
221 | 221 |
return mIsFree; |
222 | 222 |
} |
223 | 223 |
|
224 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
225 |
|
|
226 |
public void markFree() |
|
227 |
{ |
|
228 |
mIsFree = true; |
|
229 |
} |
|
230 |
|
|
224 | 231 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
225 | 232 |
|
226 | 233 |
public int getObjectMinor() |
Also available in: Unified diff
Partly merge the 'iap' branch.