/[enigma]/enigma/src/actors.cc
ViewVC logotype

Diff of /enigma/src/actors.cc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.41.2.1 by dheck, Fri Sep 19 17:44:44 2003 UTC revision 1.41.2.2 by dheck, Mon Sep 22 02:43:53 2003 UTC
# Line 59  Actor::respawn() Line 59  Actor::respawn()
59  {  {
60      V2 p =(use_respawnpos) ? respawnpos : startingpos;      V2 p =(use_respawnpos) ? respawnpos : startingpos;
61      warp (p);      warp (p);
 //    move();  
62      on_respawn(p);      on_respawn(p);
63  }  }
64    
# Line 101  Actor::warp(const px::V2 &newpos) Line 100  Actor::warp(const px::V2 &newpos)
100      actorinfo.pos = newpos;      actorinfo.pos = newpos;
101      actorinfo.vel = V2();      actorinfo.vel = V2();
102      m_sprite.move (newpos);      m_sprite.move (newpos);
103      move(); //on_motion(actorinfo.pos);      move();
104  }  }
105    
106  void  void Actor::move()
 Actor::move()  
107  {  {
108      using namespace world;      using namespace world;
109      GridPos  field(actorinfo.pos);      GridPos  field(actorinfo.pos);
# Line 133  Actor::move() Line 131  Actor::move()
131    
132      m_sprite.move (actorinfo.pos);      m_sprite.move (actorinfo.pos);
133      on_motion(actorinfo.pos);      on_motion(actorinfo.pos);
134        actorinfo.oldpos = actorinfo.pos;
135  }  }
136    
137  void  void
# Line 739  namespace Line 738  namespace
738                  // passive small whiteball do not shatter (see PerOxyd Linkgame #60)                  // passive small whiteball do not shatter (see PerOxyd Linkgame #60)
739              {              {
740                  // collision between WhiteBall_Small and blackball shatters blackball                  // collision between WhiteBall_Small and blackball shatters blackball
741                  SendMessage(a, "shatter");  //                 SendMessage(a, "shatter");
742              }              }
743          }          }
744      };      };

Legend:
Removed from v.1.41.2.1  
changed lines
  Added in v.1.41.2.2

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26