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

Diff of /enigma/src/world.cc

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

revision 1.72.2.5 by dheck, Wed Oct 1 08:45:17 2003 UTC revision 1.72.2.6 by dheck, Wed Oct 1 22:42:31 2003 UTC
# Line 48  using namespace px; Line 48  using namespace px;
48    
49  #include "world_internal.hh"  #include "world_internal.hh"
50    
 namespace  
 {  
 }  
51    
52  Object *SimpleSignal::get_target()  Object *SimpleSignal::get_target()
53  {  {
# Line 629  handle_stone_contact (StoneContact &sc, Line 626  handle_stone_contact (StoneContact &sc,
626  //             }  //             }
627              bool new_collision = true;              bool new_collision = true;
628    
629              ai.pos = ai.oldpos;         // Reset actor position  //          ai.pos = ai.oldpos;         // Reset actor position
630              if (new_collision) {              if (new_collision) {
631                  if (Stone *stone = world::GetStone(sc.stonepos)) {                  if (Stone *stone = world::GetStone(sc.stonepos)) {
632  //                     V2 pos = ai.pos;  //                     V2 pos = ai.pos;
# Line 644  handle_stone_contact (StoneContact &sc, Line 641  handle_stone_contact (StoneContact &sc,
641                  sound::PlaySound(sc.sound.c_str(), sc.contact_point);                  sound::PlaySound(sc.sound.c_str(), sc.contact_point);
642  //             }  //             }
643              }              }
644              double restitution = 1.0; //0.95;              double restitution = 0.95; //1.0; //0.95;
645              ai.vel -= (1 + restitution)*(ai.vel*sc.normal)*sc.normal;              ai.vel -= (1 + restitution)*(ai.vel*sc.normal)*sc.normal;
646          }          }
647      }      }

Legend:
Removed from v.1.72.2.5  
changed lines
  Added in v.1.72.2.6

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