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/tutorials/TutorialList.java
443 443

  
444 444
///////////////////////////////////////////////////////////////////////////////////////////////////
445 445

  
446
  public static int getOrdinal(int object)
446
  public static int getOrdinal(ObjectType object)
447 447
    {
448
    if( object== ObjectType.DIN4_3.ordinal() )
448
    if( object== ObjectType.DIN4_3 )
449 449
      {
450
      object= ObjectType.DINO_3.ordinal();
450
      object= ObjectType.DINO_3;
451 451
      }
452 452

  
453 453
    for(int i=0; i<NUM_OBJECTS; i++)
454 454
      {
455
      if( objects[i].mObject.ordinal() == object )
455
      if( objects[i].mObject == object )
456 456
        {
457 457
        return i;
458 458
        }
......
463 463

  
464 464
///////////////////////////////////////////////////////////////////////////////////////////////////
465 465

  
466
  public ObjectType getObjectList()
466
  public ObjectType getObject()
467 467
    {
468 468
    return mObject;
469 469
    }

Also available in: Unified diff