Revision 298f3977
Added by Leszek Koltunski over 1 year 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; |
|
43 | 44 |
|
44 | 45 |
private int mJsonID, mMeshID, mExtrasID; |
45 | 46 |
private int mObjectMinor, mExtrasMinor; |
... | ... | |
57 | 58 |
mUpperName = type.name(); |
58 | 59 |
mLowerName = type.name().toLowerCase(Locale.ENGLISH); |
59 | 60 |
mNumScramble = type.getNumScramble(); |
61 |
mIsFree = type.isFree(); |
|
60 | 62 |
|
61 | 63 |
mIconID = type.getIconID(); |
62 | 64 |
mJsonID = ObjectJson.getObjectJsonID(ordinal); |
... | ... | |
87 | 89 |
mNumScramble = object.numScrambles; |
88 | 90 |
mObjectMinor = object.objectMinor; |
89 | 91 |
mExtrasMinor = object.extrasMinor; |
92 |
mIsFree = object.free; |
|
90 | 93 |
|
91 | 94 |
mPatterns = null; |
92 | 95 |
mMeshState = MESH_NICE; |
... | ... | |
211 | 214 |
return mNumScramble; |
212 | 215 |
} |
213 | 216 |
|
217 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
218 |
|
|
219 |
public boolean isFree() |
|
220 |
{ |
|
221 |
return mIsFree; |
|
222 |
} |
|
223 |
|
|
214 | 224 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
215 | 225 |
|
216 | 226 |
public int getObjectMinor() |
Also available in: Unified diff
Partly merge the 'iap' branch.