[Enigma-cvs] enigma/src world.cc,1.77,1.78

[Ralf Westram <address@hidden>]

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

Modified Files:
        world.cc 
Log Message:
- passes collision-state to Actor::move



Index: world.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/world.cc,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** world.cc    27 Oct 2003 22:18:51 -0000      1.77
--- world.cc    3 Nov 2003 14:10:02 -0000       1.78
***************
*** 389,393 ****
                  double maxangle = M_PI * 0.7;
                  double angle = DoubleRand (-maxangle, maxangle);
!                 mousef = V2(mousef[0]*cos(angle) - mousef[1]*sin(angle), 
                              mousef[0]*sin(angle) + mousef[1]*cos(angle));
              }
--- 389,393 ----
                  double maxangle = M_PI * 0.7;
                  double angle = DoubleRand (-maxangle, maxangle);
!                 mousef = V2(mousef[0]*cos(angle) - mousef[1]*sin(angle),
                              mousef[0]*sin(angle) + mousef[1]*cos(angle));
              }
***************
*** 652,656 ****
  }
  
! static void
  handle_contacts(Actor *actor1, double total_dtime)
  {
--- 652,656 ----
  }
  
! static bool
  handle_contacts(Actor *actor1, double total_dtime)
  {
***************
*** 723,726 ****
--- 723,728 ----
          }
      }
+ 
+     return !a1.contact_normals.empty();
  }
  
***************
*** 739,744 ****
      {
          advance_actor(a, dtime-rest_time, dt);
!         handle_contacts(a, dtime-rest_time);
!         a->move();
          rest_time -= dt;
      }
--- 741,746 ----
      {
          advance_actor(a, dtime-rest_time, dt);
!         bool in_collision = handle_contacts(a, dtime-rest_time);
!         a->move(in_collision);
          rest_time -= dt;
      }