Browse Source

DistanceJoint:getType now returns "distance" instead of "circle"

Bill Meltsner 15 years ago
parent
commit
7611edd9ee
2 changed files with 7 additions and 6 deletions
  1. 2 1
      changes.txt
  2. 5 5
      src/modules/physics/Joint.cpp

+ 2 - 1
changes.txt

@@ -18,7 +18,8 @@ LOVE 0.7.0
   * Fixed a bug in the loader (for require).
   * Fixed a bug where ParticleSystem::setSprite did not retain the new image.
   * Fixed a bug where images would lose their settings (wrapping, filters) when setMode as called.
-  * Fixed a bug where shape:getBody wasn't exposed.
+  * Fixed a bug where shape:getBody wasn't exposed.
+  * Fixed a bug where DistanceJoint:getType() returned "circle" - it now returns "distance".
   * Invalid FSAA values now fall back to working ones (or none at all).
   * Cleaned up traceback in error screen.
   * Moved fonts to love.font (from love.graphics), only rendering remains in love.graphics.

+ 5 - 5
src/modules/physics/Joint.cpp

@@ -40,11 +40,11 @@ namespace physics
 
 	StringMap<Joint::Type, Joint::JOINT_MAX_ENUM>::Entry Joint::typeEntries[] = 
 	{
-		{"circle", Joint::JOINT_DISTANCE},
-		{"revolute", Joint::JOINT_REVOLUTE},
-		{"prismatic", Joint::JOINT_PRISMATIC},
-		{"mouse", Joint::JOINT_MOUSE},
-		{"pulley", Joint::JOINT_PULLEY},
+		{"distance", Joint::JOINT_DISTANCE},
+		{"revolute", Joint::JOINT_REVOLUTE},
+		{"prismatic", Joint::JOINT_PRISMATIC},
+		{"mouse", Joint::JOINT_MOUSE},
+		{"pulley", Joint::JOINT_PULLEY},
 		{"gear", Joint::JOINT_GEAR},
 	};