X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.cc;fp=src%2FCharacter.cc;h=9da4344aab361bd369eb26f41f56677eff2a5689;hp=52a13e63ec38d78178c9f6e9ec259d91b366e47a;hb=4f62ce947db282f0bbf4d49b3aafb83d7cf51adc;hpb=a295f8def17036c8071b56e181364f99a377cae7

diff --git a/src/Character.cc b/src/Character.cc
index 52a13e6..9da4344 100644
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -43,7 +43,7 @@ public:
 	{
 		Mf::Vector2 x = state.position - location;
 		Mf::Scalar mag = x.length();
-		Mf::Scalar d = 50.0;
+		Mf::Scalar d = 0.0;
 
 		// spring:
 		//mState.force += -15.0 * x - 1.5 * mState.velocity;
@@ -79,7 +79,7 @@ private:
 
 
 Character::Character(const std::string& name) :
-	tilemap("Particles"),
+	tilemap(name),
 	animation(name)
 {
 	mState.init();
@@ -89,9 +89,9 @@ Character::Character(const std::string& name) :
 
 	// forces
 	mState.force = Mf::Vector2(0.0, 0.0);
-	//mState.forces.push_back(SpringForce(Mf::Vector2(500.0, 200.0)));
+	//mState.forces.push_back(SpringForce(Mf::Vector2(20.0, 4.0)));
 	mState.forces.push_back(ResistanceForce(2.0));
-	//mState.forces.push_back(Mf::LinearState<2>::GravityForce(-400.0));
+	//mState.forces.push_back(Mf::LinearState<2>::GravityForce(-9.8));
 
 	// starting position
 	mState.position = Mf::Vector2(5.0, 5.0);