Project

General

Profile

« Previous | Next » 

Revision c9f87559

Added by Leszek Koltunski 12 months ago

Support Active and Inactive RubikObjects.

View differences:

src/main/java/org/distorted/objects/RubikObjectList.java
84 84
    {
85 85
    for(int i=0; i<NUM_OBJECTS; i++)
86 86
      {
87
      ListObjects type = ListObjects.getObject(i);
88
      RubikObject obj = new RubikObject(type);
89
      mObjects.add(obj);
90
      mNumObjects++;
87
      ListObjects lo = ListObjects.getObject(i);
91 88

  
92
      if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "creating local object "+type.name() );
93

  
94
      if( obj.hasExtras() )
89
      if( lo.isEnabled() )
95 90
        {
96
        if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "has extras "+mNumExtras );
91
        RubikObject obj = new RubikObject(lo);
92
        mObjects.add(obj);
93
        mNumObjects++;
97 94

  
98
        obj.setExtrasOrdinal(mNumExtras);
99
        mNumExtras++;
100
        }
101
      else
102
        {
103
        if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "no extras");
95
        if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "creating local object "+lo.name() );
96

  
97
        if( obj.hasExtras() )
98
          {
99
          if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "has extras "+mNumExtras );
100

  
101
          obj.setExtrasOrdinal(mNumExtras);
102
          mNumExtras++;
103
          }
104
        else
105
          {
106
          if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "no extras");
107
          }
104 108
        }
105 109
      }
106 110
    }

Also available in: Unified diff