[Enigma-cvs] enigma/src world.hh,1.36,1.37

[Ralf Westram <address@hidden>]

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

Modified Files:
        world.hh 
Log Message:
- added ExchangeMarbles, FindOtherMarble, FastRespawnActor, GetActorsInsideField
- WarpActor: exchanged unused parameter 'fast' by 'keep_velocity'



Index: world.hh
===================================================================
RCS file: /cvsroot/enigma/enigma/src/world.hh,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** world.hh    22 Oct 2003 10:30:10 -0000      1.36
--- world.hh    9 Nov 2003 11:47:30 -0000       1.37
***************
*** 46,50 ****
  /*
  ** ActorInfo
! ** 
  ** This class contains the information the physics engine maintains
  ** about dynamic objects ("actors").
--- 46,50 ----
  /*
  ** ActorInfo
! **
  ** This class contains the information the physics engine maintains
  ** about dynamic objects ("actors").
***************
*** 114,120 ****
  
          // Constructor.
!         StoneContact (Actor *a, 
                        GridPos stonepos,
!                       const V2 & contact_point, 
                        const V2 & surface_normal);
          StoneContact();
--- 114,120 ----
  
          // Constructor.
!         StoneContact (Actor *a,
                        GridPos stonepos,
!                       const V2 & contact_point,
                        const V2 & surface_normal);
          StoneContact();
***************
*** 240,244 ****
      void    EmitSignals (Object *src, int value = 0);
      Object *FindSignalDestination(Object *src);
!     void BroadcastMessage(const std::string& msg, 
                            const enigma::Value& value, GridLayerBits grids);
  
--- 240,244 ----
      void    EmitSignals (Object *src, int value = 0);
      Object *FindSignalDestination(Object *src);
!     void BroadcastMessage(const std::string& msg,
                            const enigma::Value& value, GridLayerBits grids);
  
***************
*** 256,268 ****
      void   AddActor(double x, double y, Actor* a);
      Actor *YieldActor(Actor *a);
!     void   WarpActor(Actor *a, double newx, double newy, bool fast);
!     void   RespawnActor(Actor *a); // like WarpActor but goto respawnpos
      void   GrabActor(Actor *a);
      void   ReleaseActor(Actor *a);
  
!     /* Find all actors at most RANGE units away from CENTER.  Returns
!        false if none were found. */
!     bool   GetActorsInRange (px::V2 center, double range,
!                              std::vector<Actor*> &actors);
  
  /* -------------------- Stones -------------------- */
--- 256,271 ----
      void   AddActor(double x, double y, Actor* a);
      Actor *YieldActor(Actor *a);
!     void   WarpActor(Actor *a, double newx, double newy, bool keep_velocity);
!     void   FastRespawnActor(Actor *a, bool keep_velocity); // like WarpActor 
but goes to respawnpos
!     void   RespawnActor(Actor *a); // like FastRespawnActor but marble 
'appears'
!     bool   ExchangeMarbles(Actor *marble1); // searches for other marble + 
exchanges them
!     Actor *FindOtherMarble(Actor *thisMarble); // (ac-whiteball <-> 
ac-blackball)
      void   GrabActor(Actor *a);
      void   ReleaseActor(Actor *a);
  
!     // Find all actors at most RANGE units away from CENTER.  Returns false 
if none were found.
!     bool GetActorsInRange(px::V2 center, double range, std::vector<Actor*> 
&actors);
!     // Find all actors that are inside 'pos'.  Returns false if none were 
found.
!     bool GetActorsInsideField(const GridPos& pos, std::vector<Actor*>& 
actors);
  
  /* -------------------- Stones -------------------- */
***************
*** 298,302 ****
  /* -------------------- Impulses -------------------- */
  
!     void addDelayedImpulse(const Impulse& impulse, double delay, 
                             const Stone *estimated_receiver);
  
--- 301,305 ----
  /* -------------------- Impulses -------------------- */
  
!     void addDelayedImpulse(const Impulse& impulse, double delay,
                             const Stone *estimated_receiver);