Project

General

Profile

« Previous | Next » 

Revision 2fca02cf

Added by Leszek Koltunski over 2 years ago

Further simplifications.

View differences:

src/main/java/org/distorted/objectlib/helpers/BlockController.java
41 41
  public static final int PLACE_4 =4;
42 42
  public static final int CONTROL_PLACE_0 =20;
43 43
  public static final int CONTROL_PLACE_1 =21;
44
  public static final int MOVES_PLACE_0 =30;
45 44

  
46 45
  private static final long THRESHHOLD_0 =  3000;
47 46
  private static final long THRESHHOLD_1 = 25000;
......
103 102
    {
104 103
    switch(last)
105 104
      {
106
      case PLACE_3         :return THRESHHOLD_1;
105
      case PLACE_3         : return THRESHHOLD_1;
107 106
      case PLACE_4         : return THRESHHOLD_2;
108 107
      case CONTROL_PLACE_0 :
109 108
      case CONTROL_PLACE_1 : return THRESHHOLD_3;
src/main/java/org/distorted/objectlib/main/ObjectControl.java
28 28
import org.distorted.library.type.Static2D;
29 29
import org.distorted.library.type.Static4D;
30 30

  
31
import org.distorted.objectlib.helpers.BlockController;
31 32
import org.distorted.objectlib.helpers.MovesFinished;
32 33
import org.distorted.objectlib.helpers.ObjectLibInterface;
33 34

  
......
541 542

  
542 543
///////////////////////////////////////////////////////////////////////////////////////////////////
543 544

  
544
    public void initialize()
545
    public void onPause()
546
      {
547
      BlockController.onPause();
548
      }
549

  
550
///////////////////////////////////////////////////////////////////////////////////////////////////
551

  
552
    public void onResume()
545 553
      {
546 554
      mPointer1 = INVALID_POINTER_ID;
547 555
      mPointer2 = INVALID_POINTER_ID;
548 556

  
549 557
      unlock();
558

  
559
      BlockController.onResume();
550 560
      }
551 561

  
552 562
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff