From 7611edd9eec77419f706765ca249c3773494d6e0 Mon Sep 17 00:00:00 2001
From: Bill Meltsner <bill@meltsner.com>
Date: Thu, 19 Aug 2010 01:05:51 -0500
Subject: [PATCH] DistanceJoint:getType now returns "distance" instead of
 "circle"

---
 changes.txt                   |  3 ++-
 src/modules/physics/Joint.cpp | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/changes.txt b/changes.txt
index f8a76a421..b8b227feb 100644
--- a/changes.txt
+++ b/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.
diff --git a/src/modules/physics/Joint.cpp b/src/modules/physics/Joint.cpp
index 5c3561cf6..776a33d0c 100644
--- a/src/modules/physics/Joint.cpp
+++ b/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},
 	};