[Enigma-cvs] enigma/src stones_complex.cc,1.53,1.54

[Ralf Westram <address@hidden>]

Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv1986/src

Modified Files:
        stones_complex.cc 
Log Message:
- laser light recalculation done when CLOSING (like oxyd does)
- changed warp parameters
- warning fix



Index: stones_complex.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/stones_complex.cc,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** stones_complex.cc   3 Nov 2003 14:23:04 -0000       1.53
--- stones_complex.cc   9 Nov 2003 11:56:49 -0000       1.54
***************
*** 308,312 ****
                  V2 mid_dest = ai->pos+warp; // position during move
  
!                 WarpActor(actor, mid_dest[0], mid_dest[1], true);
  
                  if (length(vel) < 15.0) // speed up actor
--- 308,312 ----
                  V2 mid_dest = ai->pos+warp; // position during move
  
!                 WarpActor(actor, mid_dest[0], mid_dest[1], false);
  
                  if (length(vel) < 15.0) // speed up actor
***************
*** 1699,1703 ****
      case CLOSED:
          set_model(basename+"-closed");
!         laser::MaybeRecalcLight(get_pos());
          break;
      case OPENING:
--- 1699,1703 ----
      case CLOSED:
          set_model(basename+"-closed");
!         laser::MaybeRecalcLight(get_pos()); // maybe superflous
          break;
      case OPENING:
***************
*** 1714,1717 ****
--- 1714,1718 ----
          else
              set_anim(basename+"-closing");
+         laser::MaybeRecalcLight(get_pos());
          break;
      }
***************
*** 2324,2328 ****
      if (size>1) {
          for (unsigned i = 0; i<size; ++i) {
!             int a = IntegerRand(0, size-2);
              if (a >= i) ++a;        // make a always different from j
  
--- 2325,2329 ----
      if (size>1) {
          for (unsigned i = 0; i<size; ++i) {
!             unsigned a = IntegerRand(0, size-2);
              if (a >= i) ++a;        // make a always different from j
  
***************
*** 2965,2969 ****
                  case WARP:  {
                      GridPos ac_target_pos(pv_pos.x+to_x[idx_target], 
pv_pos.y+to_y[idx_target]);
!                     world::WarpActor(*ac, ac_target_pos.x+.5, 
ac_target_pos.y+.5, true);
  
                      Stone *st = GetStone(ac_target_pos);
--- 2966,2970 ----
                  case WARP:  {
                      GridPos ac_target_pos(pv_pos.x+to_x[idx_target], 
pv_pos.y+to_y[idx_target]);
!                     world::WarpActor(*ac, ac_target_pos.x+.5, 
ac_target_pos.y+.5, false);
  
                      Stone *st = GetStone(ac_target_pos);