Project

General

Profile

« Previous | Next » 

Revision 8ab435b9

Added by Leszek Koltunski over 2 years ago

1. Remove 'db level' from objectlib (this belongs to the app!)
2. change ScreenPlay's 'mObject' to be an ObjectType.

View differences:

src/main/java/org/distorted/main/RubikActivity.java
272 272
        scores.setCountry(this);
273 273
        }
274 274

  
275
      boolean success = false;
276 275
      RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
277
      int object = play.getObject();
278

  
279
      if( object>=0 && object< ObjectType.NUM_OBJECTS )
280
        {
281
        success = true;
282
        ObjectType nextObj = ObjectType.values()[object];
283
        view.getPreRender().changeObject(nextObj);
284
        }
285

  
286
      if( !success )
287
        {
288
        ObjectType obj = ObjectType.getObject(RubikScreenPlay.DEF_OBJECT);
289
        play.setObject(this,obj);
290
        view.getPreRender().changeObject(obj);
291
        }
292

  
276
      ObjectType object = play.getObject();
277
      view.getPreRender().changeObject(object);
278
      
293 279
      if( mIsChinese && !mPolicyAccepted ) PrivacyPolicy();
294 280
      }
295 281
    

Also available in: Unified diff