[Enigma-cvs] enigma/src world.cc,1.83,1.84

[Daniel Heck <address@hidden>]

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

Modified Files:
        world.cc 
Log Message:
- Moved ActorInfo ctor here.
- Don't perform collision detection if 
  ActorInfo::ignore_contacts set.


Index: world.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/world.cc,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** world.cc    21 Nov 2003 09:28:24 -0000      1.83
--- world.cc    26 Nov 2003 08:16:53 -0000      1.84
***************
*** 50,53 ****
--- 50,64 ----
  #include "world_internal.hh"
  
+ 
+ /* -------------------- ActorInfo -------------------- */
+ 
+ ActorInfo::ActorInfo()
+ : pos(), vel(), forceacc(),
+   charge(0), mass(1), radius(1),
+   grabbed(false), ignore_contacts (false),
+   last_pos(), oldpos(), force()
+ {}
+ 
+ 
  
  
***************
*** 679,682 ****
--- 690,696 ----
      ActorInfo &a1 = *actor1->get_actorinfo();
  
+     if (a1.ignore_contacts)
+         return false;
+ 
      // List of current contacts is updated in this function
      a1.contact_normals.clear();
***************
*** 1014,1023 ****
  }
  
! /* Searches all signals for a signal starting at 'src' and returns the
!    target object.  If multiple signals start from 'src' this function
!    returns 0.
! */
! Object *world::FindSignalDestination(Object *src)
! {
      return level->signals.find_single_destination(src);
  }
--- 1028,1032 ----
  }
  
! Object *world::FindSignalDestination(Object *src) {
      return level->signals.find_single_destination(src);
  }
***************
*** 1048,1055 ****
  }
  
- /* This function is used by all triggers, switches etc. that perform
-    some particular action when activated (like opening doors or
-    switching lasers on and off).
- */
  void world::PerformAction (Object *o, bool onoff) {
      string action = "idle";
--- 1057,1060 ----