/[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.45 by dheck, Sat Jun 14 12:18:18 2003 UTC revision 1.46 by dheck, Sun Jun 15 10:46:09 2003 UTC
# Line 455  get_accel (Actor *a, const V2 & x, const Line 455  get_accel (Actor *a, const V2 & x, const
455              // Friction              // Friction
456              double vv=length(v);              double vv=length(v);
457              if (vv > 0) {              if (vv > 0) {
458                  V2 frictionf = v * options::FrictionFactor*floor->friction();                  V2 frictionf = v * enigma::FrictionFactor*floor->friction();
459                  frictionf /= vv;                  frictionf /= vv;
460                  frictionf *= pow(vv, 0.8);                  frictionf *= pow(vv, 0.8);
461                  f -= frictionf;                  f -= frictionf;
# Line 800  void world::Reset () Line 800  void world::Reset ()
800      lua::Init();      lua::Init();
801      lua::Dofile("init.lua");      lua::Dofile("init.lua");
802    
803      enigma::ConserveLevel = true;      enigma::ConserveLevel     = true;
804      enigma::AllowTogglePlayer = true;      enigma::AllowTogglePlayer = true;
805      enigma::ShowMoves = false;      enigma::ShowMoves         = false;
806        enigma::Brittleness       = 0.5;
807        enigma::SlopeForce        = 25.0;
808        enigma::SlopeForce2       = 25.0;
809        enigma::FrictionFactor    = 1.0;
810  }  }
811    
812  void world::Create (int w, int h)  void world::Create (int w, int h)

Legend:
Removed from v.1.45  
changed lines
  Added in v.1.46

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